Public Git Hosting - gromacs.git/commit

commit	18306d714b31a011860d27ea03a8d45db64476a0
author	David van der Spoel <spoel@xray.bmc.uu.se>
	Wed, 17 Sep 2014 14:43:01 +0000 (17 16:43 +0200)
committer	David van der Spoel <spoel@xray.bmc.uu.se>
	Wed, 17 Sep 2014 15:38:07 +0000 (17 17:38 +0200)
tree	92652d4dcf5d6dca33ab65724003e787676cc3a5	tree \| snapshot (tar.gz zip)
parent	dfc8e355534ae3c2743ded2162d8fe57d4b503d7	commit \| diff
parent	1857e1a5438c16bafc71101ddd56cbacb2a76581	commit \| diff

Merge release-5-0 into master

Change-Id: I862e73932dea368b5bac883eb1bf5725314efd2d

The ultimate molecular dynamics simulation package

cmake/gmxCFlags.cmake	diff1 \|	diff2 \|	blob \| history
cmake/legacy_and_external.supp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/analysisdata.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/arraydata.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/average.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/datatest.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/histogram.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/analysisdata/tests/lifetime.cpp	diff1 \|	diff2 \|	blob \| history