From 1cb1a282d4153e364d83a6df87329f389b5ace91 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 14 Oct 2014 09:21:23 -0400 Subject: [PATCH 1/2] Help: Drop development topic notes to prepare release Release versions do not have the development topic section of the CMake Release Notes index page. --- Help/release/dev/0-sample-topic.rst | 7 ------- Help/release/index.rst | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 Help/release/dev/0-sample-topic.rst diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst deleted file mode 100644 index e4cc01e23..000000000 --- a/Help/release/dev/0-sample-topic.rst +++ /dev/null @@ -1,7 +0,0 @@ -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 abc19b8e8..616a5824b 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -5,8 +5,6 @@ CMake Release Notes This file should include the adjacent "dev.txt" file in development versions but not in release versions. -.. include:: dev.txt - Releases ======== From 517e3cd1577843c2468facba4bdb2a864dcbaa5f Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 14 Oct 2014 09:22:34 -0400 Subject: [PATCH 2/2] CMake 3.1.0-rc1 version update --- Source/CMakeVersion.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9c39a11c9..716f22971 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 20141014) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 1) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 1)