From 2ba6fbf44ec255fb94380ce22ccc7f4cc3632c37 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 2 Oct 2010 11:20:26 +0000 Subject: merges r29113 from trunk into ruby_1_9_2. -- * object.c (rb_obj_class): remove mention of obsolete method. a patch from Run Paint Run Run at [ruby-core:31842]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ object.c | 4 +--- version.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38c71818a3..f16a13d610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 27 12:26:23 2010 NAKAMURA Usaku + + * object.c (rb_obj_class): remove mention of obsolete method. + a patch from Run Paint Run Run at [ruby-core:31842]. + Thu Aug 26 10:37:00 2010 NARUSE, Yui * regint.h (OnigStackIndex): the type should be intptr_t. diff --git a/object.c b/object.c index 720f1bf6b8..ba180b517e 100644 --- a/object.c +++ b/object.c @@ -146,9 +146,7 @@ rb_class_real(VALUE cl) * call-seq: * obj.class -> class * - * Returns the class of obj, now preferred over - * Object#type, as an object's type in Ruby is only - * loosely tied to that object's class. This method must always be + * Returns the class of obj. This method must always be * called with an explicit receiver, as class is also a * reserved word in Ruby. * diff --git a/version.h b/version.h index 9599a30b10..53d4f04c3e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.2" #define RUBY_RELEASE_DATE "2010-10-02" -#define RUBY_PATCHLEVEL 13 +#define RUBY_PATCHLEVEL 14 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 -- cgit v1.2.3