naruse	2014-02-22 15:04:51 +0900 (Sat, 22 Feb 2014)

  New Revision: 45115

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

  Log:
    merge revision(s) 44463: [Backport #9210]
    
    * variable.c: adding extra example in docs.
      patched by Steve Klabnik. [Bug #9210]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/variable.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45114)
+++ ruby_2_1/ChangeLog	(revision 45115)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 15:03:05 2014  Ayumu AIZAWA  <ayumu.aizawa@g...>
+
+	* variable.c: adding extra example in docs.
+	  patched by Steve Klabnik. [Bug #9210]
+
 Sat Feb 22 15:01:21 2014  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
Index: ruby_2_1/variable.c
===================================================================
--- ruby_2_1/variable.c	(revision 45114)
+++ ruby_2_1/variable.c	(revision 45115)
@@ -2517,8 +2517,9 @@ cvar_list(void *data) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/variable.c#L2517
  *     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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45114)
+++ ruby_2_1/version.h	(revision 45115)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44463


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