Merge branch 'gerrit/release-4-5-patches' into release-4-6
authorTeemu Murtola <teemu.murtola@gmail.com>
Mon, 7 May 2012 14:22:50 +0000 (17:22 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Mon, 7 May 2012 14:22:50 +0000 (17:22 +0300)
commitec750bfe9b305a8416bb73c051682d2a0a22c289
treea01e902a55023e66077a54d0ae8b501a57b21f15
parent600299a64731e912de52f27ff5fcc90eaff4be51
parent38fd43fb37e7329cc005649c8a98694fb7bf9735
Merge branch 'gerrit/release-4-5-patches' into release-4-6

Conflicts:
CMakeLists.txt
cmake/gmxGenerateVersionInfo.cmake

Change-Id: I82c2429f9b1d8441edb19f6287dbbe446fc07233
CMakeLists.txt
cmake/gmxGenerateVersionInfo.cmake