Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-REAXC/reaxc_init_md.cpp
src/fix_recenter.cpp
src/neighbor.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 31 2014, 14:16 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSa14517d1065b: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12676 f3b2605a-c512-4ea7…
rLAMMPS62c40c86fcef: include bugfix from colvars git repo - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a14517d1065b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12676 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| fdd3c860d077 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12675 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| dc1b979f4a09 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12674 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| 664cf51d7bc3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12673 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| aee4de2f0a20 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12671 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| 87b86eda4c4d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12670 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| 731f4e46746d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12669 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| d291f079d584 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12668 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| bdffea2ea7c4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12667 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| 13f65f7f1827 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12666 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| ec9ca628445e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12665 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| bbdb288175cc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12664 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| a79274aac41f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12663 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| 04fc77f85dda | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12662 f3b2605a-c512-4ea7… | Oct 30 2014 | |||
| 88d6e13898ce | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12661 f3b2605a-c512-4ea7… | Oct 30 2014 |