Homec4science

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 14 2014, 13:18.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/accelerator_cuda.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf9f7283fa5c5: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 14 2014, 13:18

Merged Changes

CommitAuthorDetailsCommitted
d989a9d950a8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11990 f3b2605a-c512-4ea7… 
May 14 2014
948e75318d95sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11989 f3b2605a-c512-4ea7… 
May 13 2014
c948a2bcb788sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11987 f3b2605a-c512-4ea7… 
May 13 2014
7d72f89ee83dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11986 f3b2605a-c512-4ea7… 
May 13 2014
8a9ba2d05037sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11985 f3b2605a-c512-4ea7… 
May 13 2014
94831bf7a4b0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11984 f3b2605a-c512-4ea7… 
May 13 2014
f9864c81e0ebsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11983 f3b2605a-c512-4ea7… 
May 13 2014
2fcb1094f5e2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11982 f3b2605a-c512-4ea7… 
May 13 2014
4d2e42e3ed51sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11981 f3b2605a-c512-4ea7… 
May 13 2014
1efa4988034csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11980 f3b2605a-c512-4ea7… 
May 13 2014
d8258f732814sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11979 f3b2605a-c512-4ea7… 
May 13 2014
6c06a66ae7b1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11978 f3b2605a-c512-4ea7… 
May 13 2014
d17e06c479e9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11976 f3b2605a-c512-4ea7… 
May 13 2014
d07b9f70e441sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11975 f3b2605a-c512-4ea7… 
May 13 2014
80a5640cc29esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11974 f3b2605a-c512-4ea7… 
May 13 2014