naruse	2014-01-11 09:06:23 +0900 (Sat, 11 Jan 2014)

  New Revision: 44556

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

  Log:
    merge revision(s) 44544:
    
    * doc/NEWS-2.1.0: Add mention for litteral.freeze

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/NEWS
    branches/ruby_2_1/version.h
Index: ruby_2_1/NEWS
===================================================================
--- ruby_2_1/NEWS	(revision 44555)
+++ ruby_2_1/NEWS	(revision 44556)
@@ -114,6 +114,7 @@ with all sufficient information, see the https://github.com/ruby/ruby/blob/trunk/ruby_2_1/NEWS#L114
     * Process.clock_getres
 
 * String
+  * "literal".freeze is now optimized to return the same object
   * New methods:
     * String#scrub and String#scrub! verify and fix invalid byte sequence.
       If you want to use this function with older Ruby,
@@ -133,6 +134,10 @@ with all sufficient information, see the https://github.com/ruby/ruby/blob/trunk/ruby_2_1/NEWS#L134
 
 === Core classes compatibility issues (excluding feature bug fixes)
 
+* Dir
+  * incompatible changes:
+    * Dir#glob returns composed characters (previously Apple Modofied UTF-8).
+
 * Hash
   * incompatible changes:
     * Hash#reject will return plain Hash object in the future versions, that
@@ -250,7 +255,7 @@ String https://github.com/ruby/ruby/blob/trunk/ruby_2_1/NEWS#L255
 * REXML::Parsers::SAX2Parser
   * Fixes wrong number of arguments of entitydecl event. Document of the event
     says "an array of the entity declaration" but implementation passes two
-    or more arguments. It is an implementation bug but it breaks backword
+    or more arguments. It is an implementation bug but it breaks backward
     compatibility.
 
 * REXML::Parsers::StreamParser
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44555)
+++ ruby_2_1/version.h	(revision 44556)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-01-09"
-#define RUBY_PATCHLEVEL 4
+#define RUBY_RELEASE_DATE "2014-01-10"
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44544


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