Merge branch release-2016 into release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 19 Dec 2017 13:23:59 +0000 (00:23 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 20 Dec 2017 11:42:06 +0000 (22:42 +1100)
commitbb1ff722eb582c04653dde39e0df9d4c80619096
treee669ae82d37e693bc80508ac9375f5c55bdd4a40
parent72aa8a9957f42cd1d9db8b66c6182c2d8bee9aa8
parent8f179303044a5ae3ccd9d042e98906c1c22bb741
Merge branch release-2016 into release-2018

Change-Id: I2c3aa754de1b8ff971854740da9815fff8a41f0d
src/gromacs/mdlib/sim_util.cpp
src/gromacs/taskassignment/resourcedivision.cpp