nagachika	2013-07-23 01:37:04 +0900 (Tue, 23 Jul 2013)

  New Revision: 42121

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

  Log:
    merge revision(s) 41933:
    
    * lib/rubygems/psych_additions.rb: Ignore Psych docs here

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/rubygems/psych_additions.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42120)
+++ ruby_2_0_0/ChangeLog	(revision 42121)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jul 23 01:36:43 2013  Zachary Scott  <e@z...>
+
+	* lib/rubygems/psych_additions.rb: Ignore Psych docs here
+
 Tue Jul 23 01:34:00 2013  Koichi Sasada  <ko1@a...>
 
 	* test/test_tracer.rb: catch up recent rubygems changes.
Index: ruby_2_0_0/lib/rubygems/psych_additions.rb
===================================================================
--- ruby_2_0_0/lib/rubygems/psych_additions.rb	(revision 42120)
+++ ruby_2_0_0/lib/rubygems/psych_additions.rb	(revision 42121)
@@ -3,7 +3,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/psych_additions.rb#L3
 # in Specification._load, but if we don't have the constant, Marshal
 # blows up.
 
-module Psych
+module Psych # :nodoc:
   class PrivateType
   end
 end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42120)
+++ ruby_2_0_0/version.h	(revision 42121)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-23"
-#define RUBY_PATCHLEVEL 276
+#define RUBY_PATCHLEVEL 277
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41933


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