From d40ee82b18f3ccc898d7a15a535c6e28cd214f79 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 16 Jan 2015 05:03:50 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index be0979188d..0ee0d1f0e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ Fri Jan 16 11:06:17 2015 SHIBATA Hiroshi * lib/unicode_normalize.rb: typo fix. [ci skip] [ruby-dev:48794][misc #10675] - + included. [ruby-core:67264] [Bug #10685] Fri Jan 16 11:04:35 2015 Nobuyoshi Nakada * re.c (unescape_nonascii): append excape sequence as-is not diff --git a/version.h b/version.h index f91a4189e2..eebf6aae32 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-01-16" -#define RUBY_PATCHLEVEL 8 +#define RUBY_PATCHLEVEL 9 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1