diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-05 14:16:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-05 14:16:03 (GMT) |
| commit | 091fbd69644e26043d1a7fe5c7a0b04d22066ca8 (patch) | |
| tree | 94abb690e747bdbc871a9fb8b7ef8f99d21d130a | |
| parent | 7037ead2bac3f90aed51861f38fce69d1d6df2e1 (diff) | |
| download | CMake-091fbd69644e26043d1a7fe5c7a0b04d22066ca8.zip CMake-091fbd69644e26043d1a7fe5c7a0b04d22066ca8.tar.gz CMake-091fbd69644e26043d1a7fe5c7a0b04d22066ca8.tar.bz2 | |
Begin post-3.4 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 5d1a3f7..752acbd 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 aaef212..1fd5993 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 4) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_PATCH 20151005) +#set(CMake_VERSION_RC 1) |