naruse	2015-01-16 11:06:34 +0900 (Fri, 16 Jan 2015)

  New Revision: 49265

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49265

  Log:
    merge revision(s) 49064: [Backport #10675]
    
    * lib/unicode_normalize.rb: typo fix. [ci skip]
      [ruby-dev:48794][misc #10675]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/unicode_normalize.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49264)
+++ ruby_2_2/ChangeLog	(revision 49265)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Jan 16 11:06:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* lib/unicode_normalize.rb: typo fix. [ci skip]
+	  [ruby-dev:48794][misc #10675]
+
 Fri Jan 16 11:04:35 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* re.c (unescape_nonascii): append excape sequence as-is not
Index: ruby_2_2/lib/unicode_normalize.rb
===================================================================
--- ruby_2_2/lib/unicode_normalize.rb	(revision 49264)
+++ ruby_2_2/lib/unicode_normalize.rb	(revision 49265)
@@ -39,7 +39,7 @@ class String https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/unicode_normalize.rb#L39
   end
 
   # :call-seq:
-  #    str.unicode_normalize(form=:nfc)
+  #    str.unicode_normalize!(form=:nfc)
   #
   # Destructive version of String#unicode_normalize, doing Unicode
   # normalization in place.
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49264)
+++ ruby_2_2/version.h	(revision 49265)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-16"
-#define RUBY_PATCHLEVEL 7
+#define RUBY_PATCHLEVEL 8
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49064


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/