Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
src/USER-FEP/pair_lj_cut_soft.cpp
Axel Kohlmeyer <akohlmey@gmail.com> | Feb 2 2015, 21:23 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
d98318fd763f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13015 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
e1285bf8462f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13014 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
f0297dc77907 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13013 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
7188f4a72a06 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13012 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
dc2d3afff51c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13011 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
cef3a9da4757 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13010 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
8d657c5391d4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13009 f3b2605a-c512-4ea7… | Jan 30 2015 | |||
e1cd500a2146 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13008 f3b2605a-c512-4ea7… | Jan 30 2015 |