diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 13:37:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-10 13:37:08 (GMT) |
| commit | 581abf6d312614cf1d01f86d7f4feba344252422 (patch) | |
| tree | fa9ec3c6cfd59ae7187f65f38e1aa4992b058593 | |
| parent | 7b0efcded38c17f9d08580c448e7a71d43261100 (diff) | |
| parent | 9d4394ee872d6147d81564a8537e597a76f14bbd (diff) | |
| download | CMake-581abf6d312614cf1d01f86d7f4feba344252422.zip CMake-581abf6d312614cf1d01f86d7f4feba344252422.tar.gz CMake-581abf6d312614cf1d01f86d7f4feba344252422.tar.bz2 | |
Merge branch 'release'
| -rw-r--r-- | Help/release/3.0.0.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/FindRuby-2.rst | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Help/release/3.0.0.rst b/Help/release/3.0.0.rst index ee8417c..e92c293 100644 --- a/Help/release/3.0.0.rst +++ b/Help/release/3.0.0.rst @@ -245,6 +245,8 @@ Modules for Qt executables. This helps disambiguate when using multiple :manual:`Qt versions <cmake-qt(7)>` in the same buildsystem. +* The :module:`FindRuby` module learned to search for Ruby 2.0 and 2.1. + Generator Expressions --------------------- diff --git a/Help/release/dev/FindRuby-2.rst b/Help/release/dev/FindRuby-2.rst deleted file mode 100644 index 50d9a48..0000000 --- a/Help/release/dev/FindRuby-2.rst +++ /dev/null @@ -1,4 +0,0 @@ -FindRuby-2 ----------- - -* The :module:`FindRuby` module learned to search for Ruby 2.0 and 2.1. |