Merge "changed number of iatoms for F_SETTLE from 1 to 3" into release-4-6
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Sun, 29 Apr 2012 07:26:00 +0000 (09:26 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 29 Apr 2012 07:26:00 +0000 (09:26 +0200)

Trivial merge