Merge branch release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 23 Mar 2014 11:00:07 +0000 (12:00 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 23 Mar 2014 11:01:06 +0000 (12:01 +0100)
commita1a2efaeb7986311a622577761497dd4fcc5d132
tree0d783b740537dabcad30e32d901f5c4a13751114
parent5c13f5e8f699e5f1aefc37c31ea34a05344b190b
parentb58afa7e304477f48ce48dfc11b9e9afd2987bc3
Merge branch release-4-6

Change-Id: Ie4431fb0002cd36799c8e664dcf4e096e66bc0ea
src/gromacs/gmxpreprocess/readir.c
src/gromacs/legacyheaders/domdec.h
src/gromacs/mdlib/clincs.c
src/gromacs/mdlib/constr.c
src/gromacs/mdlib/domdec_con.c