diff options
author | Brad King <brad.king@kitware.com> | 2015-06-02 15:19:44 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-06-02 15:19:44 (GMT) |
commit | d3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2 (patch) | |
tree | e92f091ab92992bdb1dc2dd69118c09fbde96ca7 | |
parent | 4a96a4e3bead6dfbcdfc7953739f2cd135c1af0c (diff) | |
download | CMake-d3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2.zip CMake-d3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2.tar.gz CMake-d3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2.tar.bz2 |
Begin post-3.3 development
-rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
-rw-r--r-- | Help/release/index.rst | 2 | ||||
-rw-r--r-- | Source/CMakeVersion.cmake | 4 |
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 6b98e48..b558e9d 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 727cbcc..697ea91 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 3) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_PATCH 20150602) +#set(CMake_VERSION_RC 1) |