Merge branch 'forward-patch' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/dump_custom.cpp
Axel Kohlmeyer <akohlmey@gmail.com> | Nov 27 2013, 09:09 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
9e131b08ef7a | Axel Kohlmeyer | forward port upcoming changes from upstream | Nov 27 2013 |