From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Sun, 17 Sep 2017 21:43:42 +0000 (+0200)
Subject: Merge branch release-2016
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=e02333909decfde2012b81ccc6a9d6bf4f664401;p=alexxy%2Fgromacs.git

Merge branch release-2016

Kept a cmake variable description string from release-2016

Change-Id: I2077780afbbe3cc610d699ea498caa6959e4000c
---

e02333909decfde2012b81ccc6a9d6bf4f664401
diff --cc cmake/gmxVersionInfo.cmake
index ec96b3b60f,d8ff6b58d6..48fa2b5b67
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@@ -224,8 -227,8 +224,8 @@@ if (NOT SOURCE_IS_SOURCE_DISTRIBUTION A
  endif()
  
  set(REGRESSIONTEST_VERSION "${GMX_VERSION_STRING}")
 -set(REGRESSIONTEST_BRANCH "refs/heads/release-2016")
 -set(REGRESSIONTEST_MD5SUM "a1625834b5fc8dcde0b8ef40cf64910c" CACHE INTERNAL "MD5 sum of the regressiontests tarball")
 +set(REGRESSIONTEST_BRANCH "refs/heads/master")
- set(REGRESSIONTEST_MD5SUM "366438549270d005fa6def6e56ca0256")
++set(REGRESSIONTEST_MD5SUM "366438549270d005fa6def6e56ca0256" CACHE INTERNAL "MD5 sum of the regressiontests tarball")
  
  math(EXPR GMX_VERSION_NUMERIC
       "${GMX_VERSION_MAJOR}*10000 + ${GMX_VERSION_PATCH}")