usa	2012-11-08 16:45:54 +0900 (Thu, 08 Nov 2012)

  New Revision: 37560

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

  Log:
    merge revision(s) 36520:
    
    test_dir_m17n.rb: composite character
    
    * test/ruby/test_dir_m17n.rb (test_filename_utf8_raw_windows_1252_name):
      get rid of composite character for troublesome Mac OS X file system.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/test/ruby/test_dir_m17n.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37559)
+++ ruby_1_9_3/version.h	(revision 37560)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 315
+#define RUBY_PATCHLEVEL 316
 
 #define RUBY_RELEASE_DATE "2012-11-08"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_dir_m17n.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_dir_m17n.rb	(revision 37559)
+++ ruby_1_9_3/test/ruby/test_dir_m17n.rb	(revision 37560)
@@ -219,7 +219,7 @@
   end
 
   def test_filename_utf8_raw_windows_1252_name
-    create_and_check_raw_file_name(0x00c7, "UTF-8")
+    create_and_check_raw_file_name(0x00c6, "UTF-8")
   end
 
   def test_filename_ext_euc_jp_and_int_utf_8

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36520


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