Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 10 2014, 14:54.

Description

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

Resolved Conflicts:
doc/package.txt
src/fix_move.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd52414244a9c: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 10 2014, 14:54

Merged Changes

CommitAuthorDetailsCommitted
f864979cdd9bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12463 f3b2605a-c512-4ea7… 
Sep 10 2014
3aaa82088bcdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12462 f3b2605a-c512-4ea7… 
Sep 10 2014
4d9d81fe69absjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12461 f3b2605a-c512-4ea7… 
Sep 10 2014
ca8fd22c19e7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12460 f3b2605a-c512-4ea7… 
Sep 10 2014
f9684d5076fcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12459 f3b2605a-c512-4ea7… 
Sep 10 2014
4374200a779esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12458 f3b2605a-c512-4ea7… 
Sep 10 2014
b57945c40e38sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12457 f3b2605a-c512-4ea7… 
Sep 9 2014
3f532868367csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12456 f3b2605a-c512-4ea7… 
Sep 9 2014
b843c808a503sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12455 f3b2605a-c512-4ea7… 
Sep 9 2014
4f3c884aaac3athomps
Changed optimized default to 1 
Sep 9 2014
787b9fc6f854sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12453 f3b2605a-c512-4ea7… 
Sep 9 2014
334f57f7f3easjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12452 f3b2605a-c512-4ea7… 
Sep 9 2014
3a18e667d459sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12451 f3b2605a-c512-4ea7… 
Sep 9 2014
95d3f975f591sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12450 f3b2605a-c512-4ea7… 
Sep 9 2014
ac246386d0ddsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12449 f3b2605a-c512-4ea7… 
Sep 9 2014
e898a2c91b33sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12448 f3b2605a-c512-4ea7… 
Sep 9 2014
c9c83405ab90sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12447 f3b2605a-c512-4ea7… 
Sep 9 2014