Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Sun, 10 Aug 2014 01:59:35 +0000 (21:59 -0400)
committerTeemu Murtola <teemu.murtola@gmail.com>
Sun, 10 Aug 2014 03:28:54 +0000 (05:28 +0200)
commitc1cdb61c09a96c2b70ce8a0a305ab3167d001ea4
tree23e8640ef479de59990d0bd9906265bb88b0472e
parent61ca37ff7b4b8aa9c436818c1e04f1d63ea5dd0d
parent27189bbaad21147893b239b2457843f515e69d77
Merge release-4-6 into release-5-0

Conflicts:
CMakeLists.txt (version bump ignored)

Change-Id: I4ba0209b5f69b6470470530662a0b27390a02771
src/gromacs/mdlib/pme.c