summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-19 14:30:37 (GMT)
committerBrad King <brad.king@kitware.com>2014-02-19 14:30:37 (GMT)
commit28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7 (patch)
treeacd453e7d38b0e26a798ecd3ab39b0247e91f947
parent38082dea2b9c68a934cb59b9e2f02d8b6a35de38 (diff)
downloadCMake-28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7.zip
CMake-28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7.tar.gz
CMake-28dcccfaced3c3f0a8a751cf31ae108bf6c8dda7.tar.bz2
Begin post-3.0 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 752c568..15ce065 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 5ce43f5..abe9a66 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 0)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20140219)
+#set(CMake_VERSION_RC 1)