Merge release-5-0 into master
commit18306d714b31a011860d27ea03a8d45db64476a0
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 17 Sep 2014 14:43:01 +0000 (17 16:43 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 17 Sep 2014 15:38:07 +0000 (17 17:38 +0200)
tree92652d4dcf5d6dca33ab65724003e787676cc3a5
parentdfc8e355534ae3c2743ded2162d8fe57d4b503d7
parent1857e1a5438c16bafc71101ddd56cbacb2a76581
Merge release-5-0 into master

Change-Id: I862e73932dea368b5bac883eb1bf5725314efd2d
cmake/gmxCFlags.cmake
cmake/legacy_and_external.supp
src/gromacs/analysisdata/tests/analysisdata.cpp
src/gromacs/analysisdata/tests/arraydata.cpp
src/gromacs/analysisdata/tests/average.cpp
src/gromacs/analysisdata/tests/datatest.h
src/gromacs/analysisdata/tests/histogram.cpp
src/gromacs/analysisdata/tests/lifetime.cpp