Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-CUDA/fix_set_force_cuda.h
src/USER-CUDA/pair_lj_sdk_cuda.h
src/USER-FEP/compute_fep.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 22 2014, 12:49 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSec18d90fbad4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12644 f3b2605a-c512-4ea7…
rLAMMPS83c08fab776d: add basic multi-replica support for colvars - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| ec18d90fbad4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12644 f3b2605a-c512-4ea7… | Oct 21 2014 | |||
| e806e4d2669f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12643 f3b2605a-c512-4ea7… | Oct 21 2014 | |||
| e64b937a4303 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12642 f3b2605a-c512-4ea7… | Oct 21 2014 | |||
| 7518fae9bcff | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12641 f3b2605a-c512-4ea7… | Oct 21 2014 | |||
| 20a71b1d23dc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12640 f3b2605a-c512-4ea7… | Oct 21 2014 | |||
| 4ffd3808e0f4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12639 f3b2605a-c512-4ea7… | Oct 21 2014 | |||
| c90746a20c0c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12638 f3b2605a-c512-4ea7… | Oct 21 2014 |