Merge branch release-5-1
commit545f6d76a58998bb715ff8e672077de5f143b7cb
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 16 Nov 2015 10:47:43 +0000 (16 11:47 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 16 Nov 2015 10:47:43 +0000 (16 11:47 +0100)
tree80e53415617e6004d155f96d2023b57629b7a3ea
parent85d918db94fde2ed1c9e84e8760c4e987e0f2a72
parent845355624cbe14afbfe8ec45e9c8f677e958868d
Merge branch release-5-1

Conflicts only from version numbers

Change-Id: I78235cce0c4fd7bcf4235dd888e1aef739d46001
cmake/gmxVersionInfo.cmake
src/gromacs/mdlib/clincs.cpp
src/gromacs/timing/walltime_accounting.cpp