naruse	2013-12-22 19:25:26 +0900 (Sun, 22 Dec 2013)

  New Revision: 44344

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44344

  Log:
    merge revision(s) 44332: [Backport #9281]
    
    * lib/rdoc.rb:  Set RDoc to release version.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/rdoc.rb
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44343)
+++ ruby_2_1/ChangeLog	(revision 44344)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Dec 22 19:22:52 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc.rb:  Set RDoc to release version.
+
 Sun Dec 22 19:22:31 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems.rb:  Set RubyGems to release version.
Index: ruby_2_1/lib/rdoc.rb
===================================================================
--- ruby_2_1/lib/rdoc.rb	(revision 44343)
+++ ruby_2_1/lib/rdoc.rb	(revision 44344)
@@ -64,7 +64,7 @@ module RDoc https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/rdoc.rb#L64
   ##
   # RDoc version you are using
 
-  VERSION = '4.1.0.rc.1'
+  VERSION = '4.1.0'
 
   ##
   # Method visibilities

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44332


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/