Merge "Fixed flop counting for generic cg/adress kernels" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 8 Feb 2013 15:16:17 +0000 (16:16 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 8 Feb 2013 15:16:17 +0000 (16:16 +0100)

Trivial merge