Merge branch release-2016
commitca19a19ffb2f50d1ab280fef2dc4179d1abbfdc8
authorBerk Hess <hess@kth.se>
Fri, 16 Sep 2016 11:40:25 +0000 (16 13:40 +0200)
committerBerk Hess <hess@kth.se>
Fri, 16 Sep 2016 11:41:08 +0000 (16 13:41 +0200)
tree4a609768eb6fc915f4cb692872ee89b08a0e076f
parent76a1e8ef7108a077cf2b872bec03fe485452dc10
parentc1364cf4e4b14d3726ed7bcb7caa5c17affbecf7
Merge branch release-2016

Change-Id: I0c8c02d4fbd56042ad77e7b646323b2570d06c7c
docs/dev-manual/build-system.rst
src/gromacs/gmxana/gmx_disre.cpp
src/gromacs/mdlib/force.cpp
src/gromacs/mdlib/minimize.cpp