diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 06:04:51 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 06:04:51 +0000 |
commit | b2a6346ccb9b6e32ea97ad8f8a2c494f09e46336 (patch) | |
tree | a7d2c47fd43bc7c08c52890c6996f48eb10e8c33 | |
parent | d3452b572705e11b0be6e715b00597f14ebe4bdb (diff) |
merge revision(s) 44463: [Backport #9210]
* variable.c: adding extra example in docs.
patched by Steve Klabnik. [Bug #9210]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | variable.c | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Feb 22 15:03:05 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + + * variable.c: adding extra example in docs. + patched by Steve Klabnik. [Bug #9210] + Sat Feb 22 15:01:21 2014 Tanaka Akira <akr@fsij.org> * lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated diff --git a/variable.c b/variable.c index 350bb582db..424730dcb9 100644 --- a/variable.c +++ b/variable.c @@ -2517,8 +2517,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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.1" #define RUBY_RELEASE_DATE "2014-02-22" -#define RUBY_PATCHLEVEL 59 +#define RUBY_PATCHLEVEL 60 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 |