Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 16 Oct 2017 06:10:34 +0000 (08:10 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 16 Oct 2017 06:12:42 +0000 (08:12 +0200)
commitf87bebd971d977df0b4e68aa9f2f59bc29d58452
treea93ec9c87d42cd61474c647ab2f0f68f0b7c8d6b
parentccf60bde3a741b1ee64b40c93c59f6fe9ce38c17
parentd36730ca373496906f41b2f7150caadc108c28cc
Merge branch release-2016

Change-Id: Ia56e987f52e4dee425b12b02940ad9ca18d0c13a
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/update.cpp
src/gromacs/mdtypes/commrec.h