diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-03 03:27:43 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-03 03:27:43 +0000 |
commit | d910ce1f908a70afad5261d91fd6dec0a3708240 (patch) | |
tree | 72ac3ecb727d68441d804e30fb310a71edf8b16b /version.h | |
parent | b10c3b6d51d7fb0597670d88a537d713b445098e (diff) |
merge revision(s) 42251,46345,46346: [Backport #9903]
* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
characters.
* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
characters.
* re.c (match_aref, rb_reg_regsub): consider encoding of captured
names, encoding-incompatible should not match.
[ruby-dev:48278] [Bug #9903]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-08-31" -#define RUBY_PATCHLEVEL 542 +#define RUBY_RELEASE_DATE "2014-09-03" +#define RUBY_PATCHLEVEL 543 #define RUBY_RELEASE_YEAR 2014 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 9 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" |