Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Sat, 16 Aug 2014 04:30:10 +0000 (00:30 -0400)
committerRoland Schulz <roland@utk.edu>
Sat, 16 Aug 2014 21:20:50 +0000 (17:20 -0400)
commite3d1a2232511301142cebe889d5b10dc21d0d653
treec4b0add8a4b11749bc5cffa926ba679a2a03116d
parent0790d5d03cf933c81d9435901a781d1829ce4793
parent546f7c57431c6c5d0c88017243ad3240fbd65092
Merge release-5-0 into master

Conflicts (trivial):
src/gromacs/commandline/pargs.cpp
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/options/filenameoption.cpp

Manual changes required for ConstArrayRef:
       src/gromacs/commandline/pargs.cpp
       src/gromacs/options/filenameoption.cpp
       src/gromacs/selection/selection.cpp
       src/gromacs/selection/tests/nbsearch.cpp
Manual moved REGRESSIONTEST_MD5SUM from
       CMakeLists.txt to cmake/gmxVersionInfo.cmake

Change-Id: I1a2038f72c1e1cfed830de5c540ab278dbb39cfe
22 files changed:
CMakeLists.txt
cmake/gmxVersionInfo.cmake
install-guide/install-guide.md
src/config.h.cmakein
src/gromacs/commandline/pargs.cpp
src/gromacs/gmxlib/gmx_cpuid.c
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/legacyheaders/pme.h
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/perf_est.c
src/gromacs/mdlib/pme.c
src/gromacs/mdlib/pme_pp.c
src/gromacs/mdlib/tpi.c
src/gromacs/onlinehelp/helpwritercontext.cpp
src/gromacs/options/filenameoption.cpp
src/gromacs/selection/nbsearch.cpp
src/gromacs/selection/selection.cpp
src/gromacs/selection/selection.h
src/gromacs/selection/tests/nbsearch.cpp
src/gromacs/simd/tests/simd_math.cpp
tests/CMakeLists.txt