Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Wed, 8 Feb 2012 00:14:57 +0000 (19:14 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 8 Feb 2012 00:16:10 +0000 (19:16 -0500)
commit3d4dbc1e543ac4ef88733e386e0d9ec5c873e852
tree360c215e12dd5de4eaea562e3cf4a9c9916be9c9
parent4ee508affe83aa01f5c2f227c0629ae57f9ce475
parent136b27ae8d8699e5b7c77cb269fcb2bc12c4c247
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Change-Id: I13898484048384500e946fc4dddaaca3281a8819
CMakeLists.txt
src/gmxlib/CMakeLists.txt