Merge branch release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 1 Sep 2014 16:22:23 +0000 (18:22 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 1 Sep 2014 16:22:23 +0000 (18:22 +0200)
commit67520eb58ae504226d178a3687ef82d57ba6b4b5
tree09533f6a11768a2975e879cd354dd422f9d8aada
parentc0404b29a5754cb7a0d100a92f7d5b40e2add6a5
parent0336ab2d9dad7fe9db608620ad7b1ee146f70bce
Merge branch release-4-6 into release-5-0

Conflicts:
CMakeLists.txt
Left version stuff in release-5-0 alone, because they should be
unaffected by release-4-6 version bumps.

Change-Id: I000cba25affa818b9e4283e85ae8cdf61f7c53a1
src/gromacs/gmxpreprocess/calc_verletbuf.c