Merge branch release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 11 Mar 2016 00:37:02 +0000 (01:37 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 11 Mar 2016 00:37:55 +0000 (01:37 +0100)
commit6c1b8b9f394fbca707cedfef8a4245bc018be6f8
tree76672ee8273a8fa534aea2722fa0509c84fab638
parentad7759024a41137f1f39e4e369a75545ba1223a0
parent870fe7cec7458aab0d743f1ebed58bb0b56468b7
Merge branch release-5-0 into release-5-1

Change-Id: Icb8d7bc8d5639a824fe5f45e72eede3ec7b9d3c9
src/gromacs/mdlib/sim_util.cpp