Homec4science

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

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

Description

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

Resolved Conflicts:
doc/Manual.txt
lib/gpu/lal_sw.cu

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
35814a93ebb1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11239 f3b2605a-c512-4ea7… 
Jan 13 2014
cf13b6fe20b7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11238 f3b2605a-c512-4ea7… 
Jan 13 2014
59a0c577db1dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11236 f3b2605a-c512-4ea7… 
Jan 13 2014
a5a0f79217e5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11235 f3b2605a-c512-4ea7… 
Jan 13 2014
fd43c548c8absjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11234 f3b2605a-c512-4ea7… 
Jan 13 2014
94a4b3f20a8asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11233 f3b2605a-c512-4ea7… 
Jan 13 2014
29af85e638c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11232 f3b2605a-c512-4ea7… 
Jan 13 2014
496746e338e9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11231 f3b2605a-c512-4ea7… 
Jan 13 2014
bbffbe06a229sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11230 f3b2605a-c512-4ea7… 
Jan 13 2014
427e90c15149sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11229 f3b2605a-c512-4ea7… 
Jan 13 2014