diff options
author | Brad King <brad.king@kitware.com> | 2018-06-05 15:49:08 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-05 15:49:08 (GMT) |
commit | 31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd (patch) | |
tree | 78bb519993d9f3dde4e81cb06e6757b410466acb /Help/release | |
parent | 90ebc32d9e7400a590973b30c99f2986bcb2b755 (diff) | |
parent | af63c8bd6107e8fc8edd92add144019269a9bb2a (diff) | |
download | CMake-31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd.zip CMake-31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd.tar.gz CMake-31bfad10d84eb6bf0035ccaab4eb3f93f0ab54dd.tar.bz2 |
Merge branch 'release-3.12'
Diffstat (limited to 'Help/release')
-rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
-rw-r--r-- | Help/release/index.rst | 2 |
2 files changed, 0 insertions, 9 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 4c9e96a..4b32eab 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 ======== |