Merge "Fixed timing measurements." into release-4-5-patches
commitbb6ffc1103be0879a45c74e4a10f67178d43223d
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Fri, 20 Jan 2012 08:15:33 +0000 (20 09:15 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 20 Jan 2012 08:15:33 +0000 (20 09:15 +0100)
tree1a094f93529955698ca6e5815b4298ebe1d4270d
parentf07de1a6137d3863c73cab861eeaa6a12c463ba0
parentb03f3ad185afdeea8f2e69883bd6f0f1f92f4b96
Merge "Fixed timing measurements." into release-4-5-patches