nagachika	2013-04-15 00:22:58 +0900 (Mon, 15 Apr 2013)

  New Revision: 40297

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

  Log:
    merge revision(s) 39817: [Backport #8116]
    
    * ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
      [Bug #8116] [ruby-dev:47177]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/objspace/objspace.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40296)
+++ ruby_2_0_0/ChangeLog	(revision 40297)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Apr 15 00:22:09 2013  Shota Fukumori  <her@s...>
+
+	* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
+	  [Bug #8116] [ruby-dev:47177]
+
 Mon Apr 15 00:15:04 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* class.c (HAVE_METACLASS_P): should check FL_SINGLETON flag before get
Index: ruby_2_0_0/ext/objspace/objspace.c
===================================================================
--- ruby_2_0_0/ext/objspace/objspace.c	(revision 40296)
+++ ruby_2_0_0/ext/objspace/objspace.c	(revision 40297)
@@ -225,7 +225,7 @@ total_i(void *vstart, void *vend, size_t https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/objspace/objspace.c#L225
  *
  *  def memsize_of_all klass = false
  *    total = 0
- *    ObjectSpace.each_objects{|e|
+ *    ObjectSpace.each_object{|e|
  *      total += ObjectSpace.memsize_of(e) if klass == false || e.kind_of?(klass)
  *    }
  *    total
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40296)
+++ ruby_2_0_0/version.h	(revision 40297)
@@ -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-04-15"
-#define RUBY_PATCHLEVEL 132
+#define RUBY_PATCHLEVEL 133
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

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


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