Merge "fix OpenMP detection on Mac OS broken by a6fee0b" into release-4-6
authorErik Lindahl <erik@kth.se>
Fri, 18 Jan 2013 15:09:45 +0000 (16:09 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 18 Jan 2013 15:09:45 +0000 (16:09 +0100)

Trivial merge