Merge branch 'release-3.17'

This commit is contained in:
Brad King
2020-02-05 11:38:56 -05:00
3 changed files with 3 additions and 12 deletions

View File

@@ -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.

View File

@@ -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
========

View File

@@ -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.