Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Tue, 1 May 2012 22:27:20 +0000 (18:27 -0400)
committerRoland Schulz <roland@utk.edu>
Tue, 1 May 2012 22:27:20 +0000 (18:27 -0400)
commit397b09f7f9591e6d87982d960bd58a8050dbbbe8
tree2e92aa6f3ea2c5f36f473bc5c65d948426a0d85a
parenteb0380e91f7aa729cd519bf71ea04f9f82e462b4
parent586dc5be10d41ec8b15e719617beff54360b0c5c
Merge release-4-6 into master

Change in src/gmxlib/CMakeLists.txt applied to
     src/gromacs/CMakeLists.txt

Change-Id: I15ec00d1738747c34557adffb5d58a69046fb92a
18 files changed:
CMakeLists.txt
cmake/gmxCFlags.cmake
src/gromacs/CMakeLists.txt
src/gromacs/gmxlib/ifunc.c
src/gromacs/gmxlib/mshift.c
src/gromacs/gmxlib/pbc.c
src/gromacs/gmxlib/rmpbc.c
src/gromacs/gmxlib/splitter.c
src/gromacs/gmxlib/tpxio.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/gmxpreprocess/toppush.c
src/gromacs/legacyheaders/types/graph.h
src/gromacs/mdlib/calcvir.c
src/gromacs/mdlib/constr.c
src/gromacs/mdlib/csettle.c
src/gromacs/mdlib/update.c
src/programs/gmxdump/gmxdump.c
src/programs/grompp/grompp.c