Homec4science

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

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

Description

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

  1. Resolved Conflicts:
  2. doc/Manual.txt
  3. doc/pair_reax.html
  4. src/USER-PHONON/fix_phonon.cpp

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
8dff51d5c93csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14377 f3b2605a-c512-4ea7… 
Dec 16 2015
9e3b61d926c9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14376 f3b2605a-c512-4ea7… 
Dec 16 2015
f3af23a41ba9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14375 f3b2605a-c512-4ea7… 
Dec 16 2015
ead53bc9e7c6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14373 f3b2605a-c512-4ea7… 
Dec 15 2015
0939eb1ee963sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14372 f3b2605a-c512-4ea7… 
Dec 15 2015
b5a1ba9bfadesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14371 f3b2605a-c512-4ea7… 
Dec 15 2015
06a217aa08e6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14370 f3b2605a-c512-4ea7… 
Dec 15 2015
31f22919abe6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14369 f3b2605a-c512-4ea7… 
Dec 15 2015
9f38620e1356sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14368 f3b2605a-c512-4ea7… 
Dec 15 2015
074d5962c8c6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14367 f3b2605a-c512-4ea7… 
Dec 15 2015
5f802f86b54fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14366 f3b2605a-c512-4ea7… 
Dec 15 2015
75de12f26a92sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14365 f3b2605a-c512-4ea7… 
Dec 15 2015