Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 21 2010, 18:44.

Description

Merge branch 'master' into lammps-icms

steve implemented some of the proposed
changes for the processors and thermo_modify
command slightly differently. choose the
new implementation over mine when resolving
the related conflicts.

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1e8203c77be3: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 21 2010, 18:44

Merged Changes

CommitAuthorDetailsCommitted
468afb93aa86sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4170 f3b2605a-c512-4ea7… 
May 20 2010
cb182476df02sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4168 f3b2605a-c512-4ea7… 
May 20 2010
2629df579043sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4167 f3b2605a-c512-4ea7… 
May 20 2010
ef02732feb90sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4165 f3b2605a-c512-4ea7… 
May 20 2010
a632f28fa215sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4164 f3b2605a-c512-4ea7… 
May 20 2010
841a27b4428csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4163 f3b2605a-c512-4ea7… 
May 20 2010