Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 3 Jan 2017 16:18:42 +0000 (17:18 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 3 Jan 2017 16:22:16 +0000 (17:22 +0100)
commit7e34948ea31b33956b62a205a462072df85580d1
tree30d52a1c7799692bab9392e6e6e6b6c9e6c3373f
parent1123d64d23f8903a23fa9b97b298185c88072b7a
parentc35e87d620cd22164a6f0cd0e540e15d4e82eb16
Merge branch release-5-1 into release-2016

Skipped 9e6144061f4f as instructed by its commit message.

Change-Id: Ie275096b0e99723b56747f46f5ca667d9f84b5f0
src/gromacs/gmxana/gmx_editconf.cpp
src/gromacs/gmxana/gmx_tune_pme.cpp
src/gromacs/mdlib/minimize.cpp