Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Sat, 3 Nov 2012 19:40:48 +0000 (15:40 -0400)
committerRoland Schulz <roland@utk.edu>
Sat, 3 Nov 2012 23:19:33 +0000 (19:19 -0400)
commit2c2f2c14dd93b4d357d53da6ae44e3c80d5aab93
treea2da71643bd2e70615bf61f49cd15faa4b6ade93
parentd2934a96b823c6e04eaff14e2c03aa5ac0d035ad
parent86b5c2cd3ba3bd004e1f0ba2552aa8751cf6be67
Merge release-4-6 into master

Conflicts:
CMakeLists.txt: trivial
COPYING-OTHER: moved to COPYING

Added check for ICC bug to gmxTestCXX11.cmake to not activate
HAVE_CXX11 with affected ICC versions.

Change-Id: I8b9db5895c4b5a47b4936771c941cd600f003a98
25 files changed:
CMakeLists.txt
COPYING
cmake/ThreadMPI.cmake
cmake/gmxTestCXX11.cmake
share/top/gurgle.dat
src/gromacs/gmxlib/gmx_omp.c
src/gromacs/gmxlib/libxdrf.c
src/gromacs/gmxlib/maths.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/legacyheaders/gmx_omp.h
src/gromacs/legacyheaders/xdrf.h
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/nbnxn_atomdata.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_common.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd256.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_inner.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_outer.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_utils.h
src/programs/mdrun/pme_loadbal.c
src/programs/mdrun/runner.c
src/tools/gmx_tune_pme.c