Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Fri, 21 Feb 2014 00:53:08 +0000 (19:53 -0500)
committerRoland Schulz <roland@utk.edu>
Fri, 21 Feb 2014 00:53:08 +0000 (19:53 -0500)
commitba6bc1cfca9f5dc013a82eb5806faa6c16406f3f
tree79339c0ab9e2dbebd3328291eedbe6b4444ab04e
parent20fa2cda6cb71107146522de64bb2c0387fb8727
parentc949a5ac1dff5b7444bb827da4e8be8e039ac0bf
Merge release-4-6 into master

Changed BUILD_CPU_ACCELERATION to GMX_SIMD in
CMakeLists.txt.

Reverts change to src/mdlib/pme_simd4.h. Corresponding
fix for master is under review as I5e08b0a09.

Removed reference to PD in message in shellfc.c.

Conflicts (all trivial):
CMakeLists.txt
src/contrib/fftw/CMakeLists.txt
src/gromacs/gmxlib/gmx_detect_hardware.c
src/gromacs/legacyheaders/shellfc.h
        src/gromacs/gmxlib/copyrite.cpp

Change-Id: I2d43520ae8833055eff51d431e47cd8b90d3a687
CMakeLists.txt
src/contrib/fftw/CMakeLists.txt
src/gromacs/gmxana/gmx_anaeig.c
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/gmxlib/gmx_detect_hardware.c
src/gromacs/legacyheaders/shellfc.h
src/gromacs/mdlib/shellfc.c
src/programs/mdrun/md.c