Browse Source

Merge branch 'release'

Brad King 11 years ago
parent
commit
581abf6d31
2 changed files with 2 additions and 4 deletions
  1. 2 0
      Help/release/3.0.0.rst
  2. 0 4
      Help/release/dev/FindRuby-2.rst

+ 2 - 0
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
 ---------------------
 

+ 0 - 4
Help/release/dev/FindRuby-2.rst

@@ -1,4 +0,0 @@
-FindRuby-2
-----------
-
-* The :module:`FindRuby` module learned to search for Ruby 2.0 and 2.1.