Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 5 Feb 2017 20:03:24 +0000 (21:03 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 5 Feb 2017 20:03:58 +0000 (21:03 +0100)
commit76c943d10fd6639383fb2385ac71798908f091e4
treee9ce128f1e507089ce073b47d93dced805c749b9
parent93b786d2f5358d9fa4d1cab70ea498d799dd722f
parent48d68b706614fd1dc5c432c0d570f00c7097fbfc
Merge branch release-5-1 into release-2016

Resolved conflict in gmx_order in favour of newly
corrected code from release-5-1 branch.

Change-Id: I7ed58873c0629bd33e18dd887d63b6ee8af7e32b
docs/user-guide/mdp-options.rst
src/gromacs/gmxana/gmx_order.cpp