Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 12 2013, 13:22.

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/angle_class2.txt

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6e282a0c0c74: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 12 2013, 13:22

Merged Changes

CommitAuthorDetailsCommitted
0b3730608e40sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11113 f3b2605a-c512-4ea7… 
Dec 11 2013
12f312947e5fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11112 f3b2605a-c512-4ea7… 
Dec 11 2013
199a87ae9937sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11110 f3b2605a-c512-4ea7… 
Dec 11 2013
7112d1b17077sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11109 f3b2605a-c512-4ea7… 
Dec 11 2013
2a8271a0340csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11108 f3b2605a-c512-4ea7… 
Dec 11 2013
bbc1eae436b6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11107 f3b2605a-c512-4ea7… 
Dec 11 2013