Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 30 2013, 11:45.

Description

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

Resolved Conflicts:
src/Package.sh

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc8f46921416a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 30 2013, 11:45

Merged Changes

CommitAuthorDetailsCommitted
a882513801e0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9930 f3b2605a-c512-4ea7… 
May 29 2013
3f05e239ac1esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9929 f3b2605a-c512-4ea7… 
May 28 2013
24dc52cb69a0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9928 f3b2605a-c512-4ea7… 
May 28 2013