merge revision(s) 49089: [Backport #10685]

included.  [ruby-core:67264] [Bug #10685]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-01-16 05:03:50 +00:00
parent 861b366042
commit d40ee82b18
2 changed files with 2 additions and 2 deletions

View file

@ -2,7 +2,7 @@ Fri Jan 16 11:06:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/unicode_normalize.rb: typo fix. [ci skip] * lib/unicode_normalize.rb: typo fix. [ci skip]
[ruby-dev:48794][misc #10675] [ruby-dev:48794][misc #10675]
included. [ruby-core:67264] [Bug #10685]
Fri Jan 16 11:04:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 16 11:04:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (unescape_nonascii): append excape sequence as-is not * re.c (unescape_nonascii): append excape sequence as-is not

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-01-16" #define RUBY_RELEASE_DATE "2015-01-16"
#define RUBY_PATCHLEVEL 8 #define RUBY_PATCHLEVEL 9
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1