summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-06-01 14:59:26 (GMT)
committerBrad King <brad.king@kitware.com>2016-06-01 14:59:26 (GMT)
commitd6754d37d593a0189809dcf98bc4fdf3a609f0a3 (patch)
tree97192d50c7a1828a43867b05e4fd5d6f8a99d0d7
parentb2ef225ab9de94e9d5e46549c9bce5c956973ca8 (diff)
downloadCMake-d6754d37d593a0189809dcf98bc4fdf3a609f0a3.zip
CMake-d6754d37d593a0189809dcf98bc4fdf3a609f0a3.tar.gz
CMake-d6754d37d593a0189809dcf98bc4fdf3a609f0a3.tar.bz2
Begin post-3.6 development
-rw-r--r--Help/release/dev/0-sample-topic.rst7
-rw-r--r--Help/release/index.rst2
-rw-r--r--Source/CMakeVersion.cmake4
3 files changed, 11 insertions, 2 deletions
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 92c3b63..e93b880 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,6 +5,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 6de2243..d8920e6 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 6)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20160601)
+#set(CMake_VERSION_RC 1)