Merge branch release-5-1 into master
Conflicts:
src/gromacs/legacyheaders/force.h
src/programs/mdrun/resource-division.h
- Took versions from release-5-1, and added struct keywords.
src/gromacs/selection/selectioncollection.cpp
src/gromacs/selection/selectioncollection.h
src/gromacs/selection/selectionoptionmanager.h
- Replaced Options with IOptionsContainer (also in
selectionoptionmanager.cpp).
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
- Changed applied to selectionoptionbehavior.cpp instead.
Change-Id: I6c23ef9cf9454b10f6dbabc9952df6e0497e0f52
12 files changed: