Merge branch '2sep-patch' into lammps-icms
- Conflicts:
- src/read_restart.cpp
- src/universe.cpp
Axel Kohlmeyer <akohlmey@gmail.com> | Sep 3 2015, 12:22 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
0c517447cfad | Axel Kohlmeyer | anticipate 3 Sep 2015 patch | Sep 2 2015 |