Merge "Merge branch 'release-4-6'"
authorTeemu Murtola <teemu.murtola@gmail.com>
Wed, 29 Jan 2014 05:14:11 +0000 (06:14 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 29 Jan 2014 05:14:11 +0000 (06:14 +0100)
commit18b716fd8f1b98d127ce4051607ac88e74b6ba08
treef12019d5376a698ee2d032dd818145975adbbd77
parent0a4f0948aa2b8a1f2132603836f1056bf0d17255
parent16200c9bc8d86775ddc0f8823f663a0eb7944b50
Merge "Merge branch 'release-4-6'"
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/sim_util.c
src/gromacs/mdlib/tpi.c