nagachika	2013-03-04 23:43:08 +0900 (Mon, 04 Mar 2013)

  New Revision: 39582

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

  Log:
    merge revision(s) 39286,39287:
    
    * ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
      [Github tenderlove/psych#118]
      [Github tenderlove/psych#127]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/psych/lib/psych/y.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39581)
+++ ruby_2_0_0/ChangeLog	(revision 39582)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar  4 23:42:34 2013  Zachary Scott  <zachary@z...>
+
+	* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
+	  [Github tenderlove/psych#127]
+
 Mon Mar  4 23:37:14 2013  NARUSE, Yui  <naruse@r...>
 
 	* tool/mkconfig.rb: remove prefix from rubyarchdir.
Index: ruby_2_0_0/ext/psych/lib/psych/y.rb
===================================================================
--- ruby_2_0_0/ext/psych/lib/psych/y.rb	(revision 39581)
+++ ruby_2_0_0/ext/psych/lib/psych/y.rb	(revision 39582)
@@ -1,4 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/psych/lib/psych/y.rb#L1
 module Kernel
+  ###
+  # An alias for Psych.dump_stream meant to be used with IRB.
   def y *objects
     puts Psych.dump_stream(*objects)
   end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39581)
+++ ruby_2_0_0/version.h	(revision 39582)
@@ -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-03-04"
-#define RUBY_PATCHLEVEL 11
+#define RUBY_PATCHLEVEL 12
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39286-39287


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