Merge "Revert "Fix ICC on Windows Build"" into release-4-5-patches
authorTeemu Murtola <teemu.murtola@gmail.com>
Thu, 2 Feb 2012 16:10:18 +0000 (17:10 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 2 Feb 2012 16:10:18 +0000 (17:10 +0100)
commit3385e61c0f28e2c6ce02628081098b4f901a6d10
treee3657b348c3e98023504bba266ffbab088ce0d0a
parenta17f09c593fcc1d20a79e8454e44583ee62b1c42
parentdb132bcfd4960d101c28e2d10e2223129a397679
Merge "Revert "Fix ICC on Windows Build"" into release-4-5-patches