diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-27 04:28:03 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-27 04:28:03 +0000 |
commit | 2c31816f1abd48cadda2e91262e0b30913fe1694 (patch) | |
tree | 89510593ffe15d2d822e2c5da12fdcd0673270d1 /version.h | |
parent | 4a5d839ceb4f08aff4843abc6b369b12a97e02e7 (diff) |
merge revision(s) 48111,48118,48120: [Backport #10421]
* vm_method.c (rb_method_entry_make): warn redefinition only for
already defined methods, but not for undefined methods.
[ruby-dev:48691] [Bug #10421]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-10-23" -#define RUBY_PATCHLEVEL 592 +#define RUBY_RELEASE_DATE "2014-10-27" +#define RUBY_PATCHLEVEL 593 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" |