From c386c3a2a9eff65a282ccde2e7ecd2c8c3c67c14 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 15 Feb 2014 15:57:46 +0000 Subject: merge revision(s) r44463,r44464: [Backport #9210] * variable.c: adding extra example in docs. patched by Steve Klabnik. [Bug #9210] * variable.c: [DOC] adding extra example in docs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ variable.c | 5 +++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41034b23b4..6b17c22666 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 16 00:57:13 2014 Ayumu AIZAWA + + * variable.c: [DOC] adding extra example in docs. + patched by Steve Klabnik. [Bug #9210] + Sun Feb 16 00:54:50 2014 Tanaka Akira * lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated diff --git a/variable.c b/variable.c index 080cf39e00..79e00bef79 100644 --- a/variable.c +++ b/variable.c @@ -2500,8 +2500,9 @@ cvar_list(void *data) * class Two < One * @@var2 = 2 * end - * One.class_variables #=> [:@@var1] - * Two.class_variables #=> [:@@var2, :@@var1] + * One.class_variables #=> [:@@var1] + * Two.class_variables #=> [:@@var2, :@@var1] + * Two.class_variables(false) #=> [:@@var2] */ VALUE diff --git a/version.h b/version.h index cf15725839..560debc238 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-16" -#define RUBY_PATCHLEVEL 418 +#define RUBY_PATCHLEVEL 419 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -- cgit v1.2.3