Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/pair_hybrid.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 21 2014, 16:54 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSf350cc4ec77b: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12637 f3b2605a-c512-4ea7…
rLAMMPS112ea4cd2b74: disallow using fixes from the QEQ package with newton pair off - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f350cc4ec77b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12637 f3b2605a-c512-4ea7… | Oct 20 2014 |