diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-04 14:55:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-04 14:55:43 (GMT) |
| commit | 4ec377f5c2f1cc287a433f009a6d0e3e753fe837 (patch) | |
| tree | f11aa30b6209ba69dfcc37c21461516995e9fa9b | |
| parent | dae9b3e16fdacda16ea28f47dd42d3243ba42be5 (diff) | |
| parent | 9d78ce02933cd913af3da66a23e8ada09db89e3e (diff) | |
| download | CMake-4ec377f5c2f1cc287a433f009a6d0e3e753fe837.zip CMake-4ec377f5c2f1cc287a433f009a6d0e3e753fe837.tar.gz CMake-4ec377f5c2f1cc287a433f009a6d0e3e753fe837.tar.bz2 | |
Merge branch 'release-3.15'
| -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 62032e6..35a47aa 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -7,8 +7,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 aeccf8e..e22d37c 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 14) -set(CMake_VERSION_PATCH 20190604) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 15) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 1) |