Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 26 2016, 12:35.

Description

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

  1. Resolved Conflicts:
  2. doc/Manual.txt

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2702d94cfd5e: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 26 2016, 12:35

Merged Changes

CommitAuthorDetailsCommitted
4351bad69f97sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14681 f3b2605a-c512-4ea7… 
Feb 26 2016
37810ba27182sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14680 f3b2605a-c512-4ea7… 
Feb 26 2016
2ce3daca3726sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14679 f3b2605a-c512-4ea7… 
Feb 26 2016
737c083a4f3fathomps
Enabled triclinic cells 
Feb 26 2016