Merge release-5-0 into master

Conflicts:
	CMakeLists.txt

Change-Id: Id9bdc4de634a67c4060bec0e5edf4c358cc6a228

diff --cc CMakeLists.txt
index 480243d559bb9e1459c19f397e959dd1c999277e,03f24b6f0ca6e056031a86d5cb99dc4e9dff8f43..d5ba67ab89627283aec0bb67db1706348d0276e1
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -52,12 -52,20 +52,20 @@@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CM
  # machine with no git.
  #
  # NOTE: when releasing the "-dev" suffix needs to be stripped off!
 -set(PROJECT_VERSION "5.0-rc1-dev")
+ # REGRESSIONTEST_VERSION and REGRESSIONTEST_BRANCH should always be
+ # defined.
- # The version number of the regressiontest tarball against which this
- # git branch can be tested. Normally, this will be the version of the
- # last patch release. Comment the next line out for branches leading
- # to a major/minor release.
 +set(PROJECT_VERSION "5.1-dev")
+ # If this is a released tarball, "-dev" will not be present in
+ # PROJECT_VERSION, and REGRESSIONTEST_VERSION specifies the version
+ # number of the regressiontest tarball against which the code tarball
+ # can be tested. This will be the version of the last patch release.
  set(REGRESSIONTEST_VERSION "5.0-rc1")
 -set(REGRESSIONTEST_BRANCH "refs/heads/release-5-0")
+ # If this is not a released tarball, "-dev" will be present in
+ # PROJECT_VERSION, and REGRESSIONTEST_BRANCH specifies the name of the
+ # gerrit.gromacs.org branch whose HEAD can test this code, *if* this
+ # code contains all recent fixes from the corresponding code branch.
++set(REGRESSIONTEST_BRANCH "refs/heads/master")
+ 
  set(CUSTOM_VERSION_STRING ""
      CACHE STRING "Custom version string (if empty, use hard-coded default)")
  mark_as_advanced(CUSTOM_VERSION_STRING)

diff --cc src/gromacs/fileio/confio.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_chi.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_tune_pme.c
Simple merge

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

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

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

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

diff --cc src/programs/view/view.cpp
Simple merge