Merge "Merge release-5-0 into release-5-1" into release-5-1
commit055f7726e70ee3f4d5ec14fc17a1add2214fb9bd
authorErik Lindahl <erik.lindahl@gmail.com>
Thu, 22 Oct 2015 13:13:00 +0000 (22 15:13 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 22 Oct 2015 13:13:00 +0000 (22 15:13 +0200)
tree98296482f6eaee94b77604c58737c7fc339f1eed
parent529fb9e43a678881b80109b7c577578391e3cac0
parentb7fb47a196bd1d9236fe823efde8a968d93602f4
Merge "Merge release-5-0 into release-5-1" into release-5-1
src/programs/mdrun/md.cpp