Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-FEP/fix_adapt_fep.cpp
src/USER-FEP/fix_adapt_fep.h
src/fix_adapt.cpp
src/fix_adapt.h
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jan 16 2015, 19:51 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSdd3672194344: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12943 f3b2605a-c512-4ea7…
rLAMMPS8b23a4fa1ee9: correct r-RESPA support for fix adapt and adapt/fep - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| dd3672194344 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12943 f3b2605a-c512-4ea7… | Jan 15 2015 | |||
| a630194311e5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12941 f3b2605a-c512-4ea7… | Jan 15 2015 |