Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Wed, 26 Nov 2014 01:10:03 +0000 (20:10 -0500)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 26 Nov 2014 10:05:54 +0000 (11:05 +0100)
commitcf4fd54bbe5f519e95b3e4b4bbf0672026894ff4
treea53fe1b5c0c00153c26d2747f6707e591c8c2aba
parentf56f4299b40831ca669728a1a849de4c4d90153a
parent405cc128e748b0bae802262953df742abf955139
Merge release-5-0 into master

Conflicts:
src/gromacs/mdlib/domdec.cpp (std::max)

Change-Id: Iaa77c561f52cf5815c35cb08008cf578d1be2314
CMakeLists.txt
src/gromacs/domdec/domdec.cpp
src/gromacs/gmxana/gmx_trjcat.c
src/gromacs/gmxlib/txtdump.c
src/gromacs/gmxpreprocess/calc_verletbuf.c
src/gromacs/gmxpreprocess/readrot.c
src/gromacs/mdlib/nbnxn_internal.h
src/gromacs/mdlib/nbnxn_search.c
src/gromacs/mdlib/update.cpp
src/gromacs/pulling/pull_rotation.c