Merge remote-tracking branch 'origin/release-4-6' into HEAD
authorRoland Schulz <roland@utk.edu>
Thu, 26 Jul 2012 23:32:43 +0000 (19:32 -0400)
committerRoland Schulz <roland@utk.edu>
Thu, 26 Jul 2012 23:32:43 +0000 (19:32 -0400)
commit2defe580657eadf2b42860a2c45bc82be020222a
treed0d1abbaa6345c1fe09a896239ee7d59b74cde02
parenteef8b4500180f58a2102a952a9464dd132f002dc
parent5c50b4be67dbca9ac695ac6dc62cb624fd9d0c9e
Merge remote-tracking branch 'origin/release-4-6' into HEAD

Conflicts:
CMakeLists.txt

Change-Id: Icf9d0d92b977e35d42d55f1a077a2cdc8fbad86f
CMakeLists.txt
src/gromacs/gmxlib/vmdio.c
src/gromacs/mdlib/pme.c