diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-07 14:56:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-07 14:56:41 (GMT) |
| commit | e7ef66abd02dbd9b05358ffb09c11263f5c0fcc7 (patch) | |
| tree | 50a3dcc196e306dd91f5eb19348c79309227fe14 | |
| parent | ead89868ba09bb331ae31c116f1cec4a44713b3b (diff) | |
| parent | 16613bc05074e6c895f6b86567f5c92111346d62 (diff) | |
| download | CMake-e7ef66abd02dbd9b05358ffb09c11263f5c0fcc7.zip CMake-e7ef66abd02dbd9b05358ffb09c11263f5c0fcc7.tar.gz CMake-e7ef66abd02dbd9b05358ffb09c11263f5c0fcc7.tar.bz2 | |
Merge branch 'release-3.16'
| -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 a4585a5..0cc3f97 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 bca928e..51a9217 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 15) -set(CMake_VERSION_PATCH 20191007) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 16) +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. |