Merge release-4-6 into master

Conflicts:
	admin/GerritBuild

Change-Id: I85bb23f647aa1cf59779f23598fc3c82131da75b

diff --cc CMakeLists.txt
Simple merge

diff --cc admin/GerritBuild.bat
index a3432031173ebd10377c37afd871db628a786c5d,1200e0ad83dbbdbb71854e26f2d157da9ed6463f..90ba7baeef6acf946d6a7e2616ed66ba82910fd3
mode 100644,100755..100755
--- 1/admin/GerritBuild.bat
--- 2/admin/GerritBuild.bat
+++ b/admin/GerritBuild.bat
@@@ -1,6 -1,3 +1,3 @@@
- REM Requires Windows SDK and CMake to be in the path
- REM Run Windows SDK SetEnv script
- SetEnv /Release && ^
- cmake -G "Visual Studio 10 Win64" -D GMX_DOUBLE=%GMX_DOUBLE% -D GMX_MPI=%GMX_MPI% -D GMX_OPENMP=%GMX_OPENMP% -DGMX_DEFAULT_SUFFIX=off . && ^
- msbuild /m:2 /p:Configuration=MinSizeRel All_Build.vcxproj && ^
- ctest -D ExperimentalTest -C MinSizeRel -V
+ mkdir releng
+ cd releng
 -git init && git fetch ssh://jenkins@gerrit.gromacs.org:29418/releng refs/heads/4.6.0 && git checkout -q -f FETCH_HEAD && cd .. && python -u releng/GerritBuild.py
++git init && git fetch ssh://jenkins@gerrit.gromacs.org:29418/releng refs/heads/5.0.0 && git checkout -q -f FETCH_HEAD && cd .. && python -u releng/GerritBuild.py

diff --cc src/gromacs/gmxlib/maths.c
Simple merge

diff --cc src/gromacs/legacyheaders/maths.h
Simple merge

diff --cc src/gromacs/mdlib/clincs.c
Simple merge

diff --cc src/programs/grompp/grompp.c
Simple merge