Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 31 2015, 15:54.

Description

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

  1. Resolved Conflicts:
  2. doc/Manual.html
  3. doc/Manual.txt
  4. src/REAX/fix_reax_bonds.cpp
  5. src/REAX/fix_reax_bonds.h
  6. src/REAX/pair_reax.cpp
  7. src/USER-MGPT/pair_mgpt.cpp
  8. src/USER-SMTBQ/pair_smtbq.cpp
  9. src/lammps.cpp
  10. src/timer.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1e9a4cc4b808: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 31 2015, 15:54

Merged Changes

CommitAuthorDetailsCommitted
c8c2f18edd83sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14228 f3b2605a-c512-4ea7… 
Oct 31 2015
34e1f5c71e86sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14227 f3b2605a-c512-4ea7… 
Oct 31 2015
a2481116c573sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14225 f3b2605a-c512-4ea7… 
Oct 30 2015
b4ff47495c56sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14222 f3b2605a-c512-4ea7… 
Oct 30 2015
260d9f419260sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14221 f3b2605a-c512-4ea7… 
Oct 30 2015
354e20f43157sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14220 f3b2605a-c512-4ea7… 
Oct 30 2015
0aa77408f808sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14219 f3b2605a-c512-4ea7… 
Oct 30 2015
01e0beda67a0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14218 f3b2605a-c512-4ea7… 
Oct 30 2015
dbcf968eaa58sjplimp
'' 
Oct 30 2015
8a474874616bsjplimp
'' 
Oct 30 2015
628190cbcb86sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14215 f3b2605a-c512-4ea7… 
Oct 30 2015

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.