From: Roland Schulz <roland@utk.edu>
Date: Wed, 16 Apr 2014 15:07:10 +0000 (-0400)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=49b7171504906ac62c0d404183881a2b1e674888;p=alexxy%2Fgromacs.git

Merge release-5-0 into master

Conflicts:
	CMakeLists.txt

Change-Id: Id9bdc4de634a67c4060bec0e5edf4c358cc6a228
---

49b7171504906ac62c0d404183881a2b1e674888
diff --cc CMakeLists.txt
index 480243d559,03f24b6f0c..d5ba67ab89
--- a/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!
+ # REGRESSIONTEST_VERSION and REGRESSIONTEST_BRANCH should always be
+ # defined.
 -set(PROJECT_VERSION "5.0-rc1-dev")
 +set(PROJECT_VERSION "5.1-dev")
- # 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.
+ # 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")
+ # 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/release-5-0")
++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)