Merge branch 'release'

2014-03-10 09:37:08 -04:00 · 2014-03-10 09:37:08 -04:00 · 581abf6d31
parent 7b0efcded3 9d4394ee87
commit 581abf6d31
2 changed files with 2 additions and 4 deletions
--- 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
 ---------------------

--- a/Help/release/dev/FindRuby-2.rst
+++ b/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.