Merge branch 'release-5-0'
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 15 Dec 2014 23:29:20 +0000 (00:29 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 15 Dec 2014 23:29:20 +0000 (00:29 +0100)
commitf711d7cae7edf8c5b3140822bb20b7fb8397eb75
treec260ae2ba45e8a49c7e3cbcdd4dca2dc5019a0f4
parente93234dbc4d10e800d7767f78244af5ab53921e3
parenta0133801088e43fe074e0c78464357e95a01d223
Merge branch 'release-5-0'

Conflicts:
CMakeLists.txt
Only changes from version numbers and test hashes, not relevant
for master branch

Change-Id: Ia10e2b82a4ffc3ac408813081c15fe6a858a93f3
docs/manual/install.tex
src/gromacs/domdec/domdec.cpp
src/gromacs/ewald/long-range-correction.c
src/gromacs/ewald/long-range-correction.h
src/gromacs/gmxana/gmx_tune_pme.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/gmxpreprocess/readpull.c
src/gromacs/mdlib/force.cpp
src/gromacs/mdlib/mdatom.cpp
src/programs/mdrun/runner.cpp