Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Thu, 19 Jan 2012 06:11:18 +0000 (01:11 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 19 Jan 2012 06:22:33 +0000 (01:22 -0500)
commitb711372acaa5d0daac1c8894beb0ac336e57eece
tree7872a49f71925f80e16bb618288c1ce82bd56a35
parent0b4dc1cab723286fe7e61dc651c69364e2946835
parent03315c0fb8e016223d4227c7cc63013c52c43eca
Merge release-4-5-patches into release-4-6

Conflicts:
admin/GerritBuild
admin/GerritBuild.bat

Change-Id: I812540cbc8c076aae9f21c52eb035b920430e033
CMakeLists.txt
admin/GerritBuild.bat
include/maths.h
src/config.h.cmakein
src/kernel/grompp.c
src/tools/gmx_cluster.c