diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-30 07:26:33 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-30 07:26:33 +0000 |
commit | 0b9f01644bedd7d775fa7b7c04f9957b3919b13b (patch) | |
tree | 0ffa6db5ba0f4eb9e6ec412371f288f98e38559f /version.h | |
parent | 16a10e0a95bd2ae94e4b93f8c3b3027806632547 (diff) |
merge revision(s) 45367,45387,45388,45389: [Backport #9475]
* vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
for a method aliased in a module. [ruby-core:61636] [Bug #9663]
* vm_method.c (rb_method_entry_get_without_cache): get rid of
infinite recursion at aliases in a subclass and a superclass.
return actually defined class for other than singleton class.
[ruby-core:60431] [Bug #9475]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-04-30" -#define RUBY_PATCHLEVEL 470 +#define RUBY_PATCHLEVEL 471 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 4 |