Merge branch release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 26 Jul 2015 11:51:46 +0000 (13:51 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 26 Jul 2015 11:54:54 +0000 (13:54 +0200)
commit203fb41e50e3681e1eba0e858f493a0856423733
treeaadf6db63d916de712bc29caabe1c1c9971d1707
parent61ba45d5a1865eace484126b5beeb2ea286fc6d7
parentad4cbeec3e2127cadf3de1b99980383f1c5e82bb
Merge branch release-5-0 into release-5-1

Conflicts:
CMakeLists.txt
Version numbering management code has moved to new home, nothing
needs to change here from the bumps to numbering in release-5-0
branch.

Change-Id: I8e45709c83d5c181900cca50b2ccba489630bbe7
src/gromacs/mdlib/mdebin.c