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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb
index e37a2de31d..2cf1c15441 100644
--- a/test/ruby/test_dir_m17n.rb
+++ b/test/ruby/test_dir_m17n.rb
@@ -219,7 +219,7 @@ class TestDir_M17N < Test::Unit::TestCase
   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
diff --git a/version.h b/version.h
index dbc0e8dd73..bb26c1bf92 100644
--- a/version.h
+++ b/version.h
@@ -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