Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 30 Oct 2015 13:02:13 +0000 (14:02 +0100)
committerBerk Hess <hess@kth.se>
Tue, 3 Nov 2015 13:21:32 +0000 (14:21 +0100)
commite1956df078876090bd16545cebb91eecf244291e
treeee5584ca529e2f73b9310e7a13ab362ce00cd607
parentcb348e33c030ea0bd0d632cabdcecc42cdf40a7f
parent0def745ef1fd8267811b9aa5e03abeacdb1d47a8
Merge branch release-5-1

Minor conflicts handling the wallcycle bug that has been fixed in both
branches, so that subcounters work (verified) and nvcc management.

Change-Id: I23ce09dd6e0dd75f407fba90456bb106c41fc8b2
CMakeLists.txt
cmake/gmxManageGPU.cmake
cmake/gmxManageNvccConfig.cmake
src/gromacs/CMakeLists.txt
src/gromacs/commandline/shellcompletions.cpp
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
src/programs/mdrun/md.cpp
src/testutils/CMakeLists.txt