Homec4science

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

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

Description

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

Resolved Conflicts:
src/VORONOI/Install.sh

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
415997f215dfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12936 f3b2605a-c512-4ea7… 
Jan 13 2015
bcca087203b7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12934 f3b2605a-c512-4ea7… 
Jan 13 2015