Merge branch release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 9 Apr 2015 08:41:01 +0000 (10:41 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 9 Apr 2015 08:43:17 +0000 (10:43 +0200)
commit168a647b1f9f67ba8532fd50c9698701ffede6e3
tree05a2e80335d550e638de6b8de761827168e69dc7
parent3bd1342556994115a8e4bcd3aad8debca607a13c
parenta81810e232bcbbe9335fe82c06b4005bdba8ac92
Merge branch release-5-0

Change-Id: Ice890f6d9b0235bc2f07e5c73ee2264a32f18a86
CMakeLists.txt
cmake/gmxTestCXX11.cmake
docs/manual/forcefield.tex
src/gromacs/gmxana/gmx_hbond.c
src/gromacs/gmxlib/txtdump.c
src/gromacs/gmxpreprocess/toputil.c
src/gromacs/mdlib/coupling.cpp