Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Thu, 19 Jan 2012 07:18:35 +0000 (02:18 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 19 Jan 2012 07:18:35 +0000 (02:18 -0500)
commit60bee4720c88790cb6ed618598bf145a7c9bc012
treec49d2a13e28da3eefad06be0e5462999f594b97d
parent138333ad61b9a332c79682bfc117b80b2b13c3cc
parentb711372acaa5d0daac1c8894beb0ac336e57eece
Merge release-4-6 into master

Conflicts:
admin/GerritBuild

Change-Id: I85bb23f647aa1cf59779f23598fc3c82131da75b
CMakeLists.txt
admin/GerritBuild.bat
src/gromacs/gmxlib/maths.c
src/gromacs/legacyheaders/maths.h
src/gromacs/mdlib/clincs.c
src/programs/grompp/grompp.c