Merge "Merge branch 'origin/release-5-1'"
authorTeemu Murtola <teemu.murtola@gmail.com>
Fri, 11 Dec 2015 06:27:45 +0000 (07:27 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 11 Dec 2015 06:27:45 +0000 (07:27 +0100)
commitfa14fefdbd310eb63a87a944d777aa38a1ea6bab
tree960cb82bfe7636f123ec5ab156b516ab3866515b
parent2dbc701f109f61ad717a685151ca293f5ba5a8fb
parent47f991bebae88382a06a404ab78190c1c974b125
Merge "Merge branch 'origin/release-5-1'"
src/gromacs/mdlib/coupling.cpp