Merge branch release-2016 into release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 9 Jan 2018 07:42:07 +0000 (08:42 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 9 Jan 2018 07:43:26 +0000 (08:43 +0100)
commit9c6a7b39062ef2e5825ba522d50ce943c7039445
tree75e4ae691abeaf092705482bd38f2148e4916f01
parent84cc59e58f40d1810618b9eb8d2f203199c017d5
parentaa8b47218cede5f38bc7d8487bb66899c5ce580a
Merge branch release-2016 into release-2018

Change-Id: I22d5b28794a4bbb3b122af339a282695aa64f266
src/gromacs/domdec/domdec.cpp
src/gromacs/domdec/domdec_box.cpp