diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-01 19:45:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-01 19:45:08 (GMT) |
| commit | 6cfca517ceec4555615a9487f6f2eaea55a2ebff (patch) | |
| tree | 8dd07e3057240716d42bd9514d03362ffdfb3ad8 | |
| parent | 2d5675e4fa92750c6eec8fd07c1b5c8634dd76ca (diff) | |
| parent | c01d01646ab774862040c7147bb4f48cb31f1750 (diff) | |
| download | CMake-6cfca517ceec4555615a9487f6f2eaea55a2ebff.zip CMake-6cfca517ceec4555615a9487f6f2eaea55a2ebff.tar.gz CMake-6cfca517ceec4555615a9487f6f2eaea55a2ebff.tar.bz2 | |
Merge branch 'release-3.26'
| -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 d434a3a..c82889f 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 1bdf218..37be9c1 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 25) -set(CMake_VERSION_PATCH 20230201) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 26) +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. |