Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/QEQ/fix_qeq.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 20 2015, 14:09 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS7e06417ffeab: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13145 f3b2605a-c512-4ea7…
rLAMMPSbfb7cd697cb7: check special_bond parameters to be correctly formatted numbers - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7e06417ffeab | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13145 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 9db7e6449fd6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13143 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 118934d9cff9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13142 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 725664070006 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13141 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 36c6120f3db5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13140 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| ce3595660fe5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13139 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 7043895ff4a8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13138 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 8589d3752726 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13137 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 392342bb02cb | pscrozi | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13136 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 4e8c2824e3e4 | pscrozi | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13135 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 30d3b91ec07b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13133 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 31b4d501a964 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13132 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 5d5675fae905 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13131 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| bb6d9e903b2d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13130 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| ccac6df71dcc | pscrozi | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13129 f3b2605a-c512-4ea7… | Feb 20 2015 | |||
| 58f6f5695386 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13128 f3b2605a-c512-4ea7… | Feb 19 2015 | |||
| 00834f6d844c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13127 f3b2605a-c512-4ea7… | Feb 19 2015 | |||
| 067833cf074c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13126 f3b2605a-c512-4ea7… | Feb 19 2015 | |||
| f300f2367ed0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13125 f3b2605a-c512-4ea7… | Feb 19 2015 |