Merge "Merge branch release-4-6"
authorTeemu Murtola <teemu.murtola@gmail.com>
Thu, 26 Sep 2013 19:00:11 +0000 (21:00 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 26 Sep 2013 19:00:11 +0000 (21:00 +0200)
commit90a0ef0211de1133ca06915523c9e008468851d3
treeb92d91e1b9be68b1c6674e1718bea9f7e76391fa
parent7abbb6aea35c67168d143144edeed214ac3b6275
parentffbffe8d9b43b9f2b00bab1ad0ed4188b4b100a1
Merge "Merge branch release-4-6"
src/gromacs/gmxana/gmx_tune_pme.c
src/programs/mdrun/md.c