Merge 'origin/release-4-6' into master
authorRoland Schulz <roland@utk.edu>
Fri, 11 May 2012 14:36:02 +0000 (10:36 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 16 May 2012 15:26:00 +0000 (11:26 -0400)
commit4eca83bb2472944056ca61fa04e9f5382f950e54
treebba5d2d7775851de3574b9c0efcfdc5d807af39a
parent78ae20ff2cb13b2f717477effef428b13e1be9cb
parent9f86610a49bce304e5f6b0cd0c50007cee6e277f
Merge 'origin/release-4-6' into master

Conflicts:
src/gromacs/genversion.sh
src/kernel/CMakeLists.txt
src/programs/mdrun/mdrun.c
src/programs/mdrun/runner.c

Change-Id: Ifa85592226e84dea08d707ef1a76ee3020ed3bc3
16 files changed:
CMakeLists.txt
cmake/gmxCFlags.cmake
src/gromacs/gmxlib/bondfree.c
src/gromacs/gmxlib/confio.c
src/gromacs/gmxlib/enxio.c
src/gromacs/gmxlib/futil.c
src/gromacs/gmxlib/gmx_random.c
src/gromacs/gmxlib/index.c
src/gromacs/gmxlib/libxdrf.c
src/gromacs/gmxlib/main.c
src/gromacs/gmxlib/statutil.c
src/gromacs/legacyheaders/pull_rotation.h
src/gromacs/legacyheaders/types/commrec.h
src/gromacs/mdlib/pme.c
src/programs/mdrun/md.c
src/programs/mdrun/mdrun.c