Merge branch 'lammps-icms' of git://git.icms.temple.edu/lammps-icms into lammps-icms
Resolved Conflicts:
src/fix_adapt.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Aug 12 2013, 02:15 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSa2d8a655f05c: make fix adapt compatible with using -suffix
rLAMMPS1cdb01dfe3b9: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a2d8a655f05c | Axel Kohlmeyer | make fix adapt compatible with using -suffix | Aug 12 2013 | |||
| 212212df717a | Axel Kohlmeyer | make code compile again | Aug 12 2013 | |||
| 713a1797bb77 | Axel Kohlmeyer | bugfix for grmask() function in atom style variables | Aug 12 2013 | |||
| 0c3b4ef504f5 | Axel Kohlmeyer | fix bug from overeager deletion of unused variables | Aug 12 2013 |