archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) r44463,r44464: [Backport #9210]

Browse source 
* 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
This commit is contained in:
nagachika 2014-02-15 15:57:46 +00:00
parent 5d5fb5f2b4
commit c386c3a2a9
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Feb 16 00:57:13 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* variable.c: [DOC] adding extra example in docs.
patched by Steve Klabnik. [Bug #9210]
Sun Feb 16 00:54:50 2014 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated

5
variable.c
View file

@ -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

2
version.h
View file

@ -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