Merge branch release-2016 into release-2018
commit5042c87c5bf903e7417f3f88724625fc8173790f
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Dec 2017 08:56:40 +0000 (12 19:56 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Dec 2017 09:08:42 +0000 (12 20:08 +1100)
tree4c343f4469220026d891d733f292f311151fbcec
parent24a9d798a369c6d082055ed0c3b7a24102aba82a
parentc98e6fc7d81638c3c2067478390ddeed4f17978f
Merge branch release-2016 into release-2018

Change-Id: Icd7a26c399258adccf93b6d49b43567810072802
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdrunutility/handlerestart.cpp