Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-FEP/compute_fep.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 1 2015, 12:32 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS5c5df8956486: Fixing segfault in USER-FEP
rLAMMPS7f432adc625b: make sure that pointer are set NULL, if not used (compute fep). - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 5c5df8956486 | stamoor | Fixing segfault in USER-FEP | Aug 31 2015 | |||
| 14554c93af5a | stamoor | Fixing compile error in USER-OMP | Aug 31 2015 | |||
| 31318401b6ca | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13972 f3b2605a-c512-4ea7… | Aug 31 2015 |