Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Sat, 10 Nov 2012 22:54:36 +0000 (17:54 -0500)
committerRoland Schulz <roland@utk.edu>
Sat, 10 Nov 2012 22:55:14 +0000 (17:55 -0500)
commit8143b02c34517e02b5bbb6e4e2e0eead97cdfa0a
tree9618a2d83d6ca99a382d48c8bc1f1d440de60854
parenta9ec9844a0a6fc4a8d234dc02d294696b15d9540
parentdb1b871ca151eeb66f01ff80e9c391e3b1807675
Merge release-4-6 into master

Change-Id: I86203d25d2e3c1bacdfa58207914830aadd61f4f
src/config.h.cmakein
src/gromacs/legacyheaders/types/commrec.h
src/gromacs/mdlib/ns.c