Merge branch 'release-4-5-patches' into release-4-6
commit041bdb82cd91f877ed4696d5f6c2b0501c54b3e9
authorSzilard Pall <pszilard@cbr.su.se>
Wed, 28 Mar 2012 16:18:10 +0000 (28 18:18 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Wed, 28 Mar 2012 16:22:35 +0000 (28 18:22 +0200)
tree2e6b3386e23ff14cad12dc821d7f7558715ce4c9
parentdd95b53e76b80e08dd3e7237e08826815b803543
parent2c59fdcc2d05d49d39e9d19db6a497aa8a3c9dfc
Merge branch 'release-4-5-patches' into release-4-6

Change-Id: Id4fc52b784ac55c2e57669af391b8d2a70a56695
cmake/gmxCFlags.cmake
src/kernel/readir.c
src/mdlib/sim_util.c
src/tools/gmx_bar.c