Merge release-5-1 into master
authorBerk Hess <hess@kth.se>
Sat, 19 Dec 2015 14:27:09 +0000 (15:27 +0100)
committerBerk Hess <hess@kth.se>
Sun, 20 Dec 2015 09:10:53 +0000 (10:10 +0100)
commit615fd567c858a2a9f9d3dd39d8752ad0c553dc66
tree4d0c749f8aaf4e15cf176f033e59e95d363127ef
parentab750778c01e7d58aa1d58e250433010fe2c99a2
parentc5744608212dfcf26f7649f8444d479e05ec1b4c
Merge release-5-1 into master

Mostly trivial conflicts, some C++ fixes in perf_est.cpp.

Change-Id: Iacdc7629deeef20db9554f9a880681d1ae6f1e10
src/gromacs/domdec/domdec_setup.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdlib/perf_est.cpp
src/gromacs/mdlib/perf_est.h
src/gromacs/mdlib/stat.cpp
src/gromacs/pulling/pull.cpp