Homec4science

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

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

Description

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

  1. Resolved Conflicts:
  2. doc/Manual.txt
  3. doc/pair_reax.html

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
0fd57a6fe4a8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14395 f3b2605a-c512-4ea7… 
Dec 21 2015
6f10e999c93bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14394 f3b2605a-c512-4ea7… 
Dec 21 2015