summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--variable.c5
-rw-r--r--version.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aea157baa6..6ef6b3e9df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index 57bd213e7e..2edc89841c 100644
--- a/version.h
+++ b/version.h
@@ -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