diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-14 13:28:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-14 13:28:28 (GMT) |
| commit | 08f29c600877a445ef2f5b4e6125563febeb1e38 (patch) | |
| tree | 9eb7cf68277edb918bf07dd479e5a4c179e28309 | |
| parent | c113efa7033e27ee3b7a0d4803647830462c3025 (diff) | |
| parent | 517e3cd1577843c2468facba4bdb2a864dcbaa5f (diff) | |
| download | CMake-08f29c600877a445ef2f5b4e6125563febeb1e38.zip CMake-08f29c600877a445ef2f5b4e6125563febeb1e38.tar.gz CMake-08f29c600877a445ef2f5b4e6125563febeb1e38.tar.bz2 | |
Merge branch 'release'
| -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 | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst deleted file mode 100644 index e4cc01e..0000000 --- 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 abc19b8..616a582 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 ======== diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9c39a11..716f229 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) |