Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 21 2015, 02:06.

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 rLAMMPS490401bd6a57: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 21 2015, 02:06

Merged Changes

CommitAuthorDetailsCommitted
0656a3e0b5casjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14392 f3b2605a-c512-4ea7… 
Dec 19 2015
e2ec56c17156sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14391 f3b2605a-c512-4ea7… 
Dec 19 2015
2926854b8d56sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14390 f3b2605a-c512-4ea7… 
Dec 19 2015
df8b58a8c6a9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14389 f3b2605a-c512-4ea7… 
Dec 19 2015
528053b65fd1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14388 f3b2605a-c512-4ea7… 
Dec 19 2015
15063188b8d0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14387 f3b2605a-c512-4ea7… 
Dec 19 2015
72ebb1dd9bd5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14386 f3b2605a-c512-4ea7… 
Dec 19 2015