Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 30 2012, 15:56.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
tools/restart2data.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0c73ba06a70b: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 30 2012, 15:56

Merged Changes

CommitAuthorDetailsCommitted
2506f714691csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8000 f3b2605a-c512-4ea7… 
Mar 30 2012
567878bc6558sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7999 f3b2605a-c512-4ea7… 
Mar 29 2012