Merge "Merge release-5-0 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Thu, 4 Sep 2014 14:48:14 +0000 (16:48 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 4 Sep 2014 14:48:15 +0000 (16:48 +0200)
commit713e268b94ea1b366380676a349eae33925c678f
treef171a676ae92390a9f2100b95a7e2e0aa36197b2
parentc73681d683a8e2079ed029a9013f9d690ac65ea5
parenta786c5005ab7b72a13b5c55e9f98d750670b2e87
Merge "Merge release-5-0 into master"
src/gromacs/CMakeLists.txt
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/sim_util.c
src/programs/mdrun/md.cpp