Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 15 2013, 14:56.

Description

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

Resolved Conflicts:
src/Depend.sh

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS92b062658973: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 15 2013, 14:56

Merged Changes

CommitAuthorDetailsCommitted
d46b65f17cdbathomps
Added remap keyword to change_box command 
May 14 2013
65f2b0ed7604sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9881 f3b2605a-c512-4ea7… 
May 14 2013
860009b734ecathomps
Added citations to headers 
May 14 2013
e3534cb74e27sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9879 f3b2605a-c512-4ea7… 
May 14 2013