Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Tue, 20 Nov 2012 02:17:30 +0000 (21:17 -0500)
committerRoland Schulz <roland@utk.edu>
Tue, 20 Nov 2012 02:17:30 +0000 (21:17 -0500)
commit41a0664273e13dc3ca419c6938e09827c2709843
tree5892a05a7ef28d9878ca44ecd8e59e92abddf902
parent907121fb073c3d2b9645ecc7f213f10e519a5599
parentf187738ec7e732c87dfc6ffa0ae81b20d7cdd807
Merge release-4-5-patches into release-4-6

Conflicts:
src/tools/gmx_tune_pme.c

Change-Id: I924851995261a7777def8a5dea168597aabf0e0d
cmake/gmxCFlags.cmake
src/tools/gmx_tune_pme.c