Merge release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 13 Oct 2014 10:02:59 +0000 (12:02 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 13 Oct 2014 10:04:40 +0000 (12:04 +0200)
commitd2201a2d611b5df5baaf321111689db94d8dcaa5
tree93139050b33c1efd126cfc5549fbc8e1bb6ef282
parent5c7db3023cab483b0f0f3e40c96d2f027f63e81d
parentf2007baaf33978684bde92ecc1b43f57d6525666
Merge release-4-6 into release-5-0

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