diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-01 14:52:52 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-01 14:52:52 +0000 |
commit | 4d3df433e9c638e1824832edf8a6e87ffd2741ea (patch) | |
tree | 7b8182e6b061068e811357ef513d026bf1141aff /version.h | |
parent | 506ee0c16033dde58d53a34876c762750598dad8 (diff) |
merge revision(s) 40462: [Backport #8323]
* io.c (rb_io_ext_int_to_encs, parse_mode_enc): bom-prefixed name is
not a real encoding name, just a fallback. so the proper conversion
should take place even if if the internal encoding is equal to the
bom-prefixed name, unless actual encoding is equal to the internal
encoding. [ruby-core:54563] [Bug #8323]
* io.c (io_set_encoding_by_bom): reset extenal encoding if no BOM
found. [ruby-core:54569]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40541 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 "2013-04-27" -#define RUBY_PATCHLEVEL 175 +#define RUBY_RELEASE_DATE "2013-05-01" +#define RUBY_PATCHLEVEL 176 #define RUBY_RELEASE_YEAR 2013 -#define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_MONTH 5 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" |