diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-05 16:38:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-05 16:38:56 (GMT) |
| commit | 0cccec23ca5760d3cf29547821d2a2bc589e4719 (patch) | |
| tree | 8a9c0eafdecb26ad13c68f3c88c7e95f13b83e2b | |
| parent | 155540d89eb5ac00fd8ba03a9580de2382af6386 (diff) | |
| parent | 13ef3285df97fa97a4cc1b7fe81741aeb8adcf7a (diff) | |
| download | CMake-0cccec23ca5760d3cf29547821d2a2bc589e4719.zip CMake-0cccec23ca5760d3cf29547821d2a2bc589e4719.tar.gz CMake-0cccec23ca5760d3cf29547821d2a2bc589e4719.tar.bz2 | |
Merge branch 'release-3.17'
| -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 22b1a09..5d1f8a2 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 1b0765b..f08760b 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,8 +1,8 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) -set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20200205) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 17) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) # Start with the full version number used in tags. It has no dev info. |