summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-05 14:59:04 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-05 14:59:04 (GMT)
commit098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (patch)
tree1167717c1dfac5cbdebe182acbce118c4586027f
parent9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa (diff)
downloadCMake-098160d5f2a1aa35d2f14c585dd87cefd8f56f41.zip
CMake-098160d5f2a1aa35d2f14c585dd87cefd8f56f41.tar.gz
CMake-098160d5f2a1aa35d2f14c585dd87cefd8f56f41.tar.bz2
Begin post-3.2 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 a058bc1..45d0a69 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 8ffe8c4..a7d6c4b 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 2)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20150205)
+#set(CMake_VERSION_RC 1)