Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Fri, 3 Feb 2012 18:43:09 +0000 (13:43 -0500)
committerRoland Schulz <roland@utk.edu>
Fri, 3 Feb 2012 18:45:50 +0000 (13:45 -0500)
commit0fd439d085ef7fdd8fe805790d7126cb912155b5
treeb27c655169e1d751a9e54069db56c1a949683a9f
parent8fb8f7c80190d7b1a5d9aa89fd0d1d93d50c9293
parent10cc08186ff3b46e82959322fa5ddf72ebc619dc
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Change-Id: I825d441cf0d13d53ea8b460cb97e2e7775f2e8ce
cmake/gmxCFlags.cmake
src/kernel/readir.c
src/kernel/tpbcmp.c