Merge "Fixes SSE/AVX compilation under Windows" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 10 Jan 2013 15:30:03 +0000 (16:30 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 10 Jan 2013 15:30:03 +0000 (16:30 +0100)

Trivial merge