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)
commit24ff3ced3b5c1780f9b1b7858338bd4c4fa9da0d
tree7d0468e9fd2668e6f7d15aac436573f1ee6eb830
parenta515dbd386756c630cb1f9a59f3b783bcb04476e
parent714960e2942e7e8554acade18b46ba7674affd66
Merge "fix OpenMP detection on Mac OS broken by a6fee0b" into release-4-6