[Cmake-commits] CMake branch, master, updated. v3.10.2-1040-gf211193

Kitware Robot kwrobot at kitware.com
Mon Feb 5 11:45:03 EST 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f211193afee5ff478d61ff0678e13b6180c481a5 (commit)
       via  363770f5f6017de82e5372d7dbe03a66edc2c995 (commit)
       via  51b287c40cd80a0c27caa3f99cd8d729c20cc3e5 (commit)
       via  e29df9924a358b2021bdd2c3bd75cc69a1101bdf (commit)
      from  9c1efb614dee294cb3a1077e8a232573f309c605 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f211193afee5ff478d61ff0678e13b6180c481a5
commit f211193afee5ff478d61ff0678e13b6180c481a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 5 11:40:43 2018 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 5 11:40:43 2018 -0500

    Begin post-3.11 development

diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
new file mode 100644
index 0000000..e4cc01e
--- /dev/null
+++ b/Help/release/dev/0-sample-topic.rst
@@ -0,0 +1,7 @@
+0-sample-topic
+--------------
+
+* This is a sample release note for the change in a topic.
+  Developers should add similar notes for each topic branch
+  making a noteworthy change.  Each document should be named
+  and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 7375faf..552922e 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -7,6 +7,8 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
+.. include:: dev.txt
+
 Releases
 ========
 
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8fd129a..d422d29 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 11)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20180205)
+#set(CMake_VERSION_RC 1)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=363770f5f6017de82e5372d7dbe03a66edc2c995
commit 363770f5f6017de82e5372d7dbe03a66edc2c995
Merge: 9c1efb6 51b287c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 5 11:39:26 2018 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 5 11:39:26 2018 -0500

    Merge branch 'release-3.11'


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake              |    2 +-
 Utilities/Release/upload_release.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list