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)
1  2 
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/sim_util.c
src/gromacs/mdlib/tpi.c

Simple merge
Simple merge
Simple merge