usa	2012-11-08 16:21:57 +0900 (Thu, 08 Nov 2012)

  New Revision: 37559

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

  Log:
    merge revision(s) 36516
    
    * test/ruby/test_dir_m17n.rb: remove a garbage.

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

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37558)
+++ ruby_1_9_3/ChangeLog	(revision 37559)
@@ -1,3 +1,7 @@
+Thu Nov  8 16:17:54 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_dir_m17n.rb: remove a garbage.
+
 Thu Nov  8 15:22:09 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_dir_m17n.rb: sorry, typo.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37558)
+++ ruby_1_9_3/version.h	(revision 37559)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 314
+#define RUBY_PATCHLEVEL 315
 
 #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 37558)
+++ ruby_1_9_3/test/ruby/test_dir_m17n.rb	(revision 37559)
@@ -199,7 +199,6 @@
         win_expected_filename = filename.encode(Encoding.find("filesystem"), "euc-jp") rescue "?"
         opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
         ents = Dir.entries(".", opts)
-        p ents
         result = ents.include?(filename) ||
                (/darwin/ =~ RUBY_PLATFORM && ents.include?("%A4%A2".force_encoding("ASCII-8BIT"))) ||
                (/mswin|mingw/ =~ RUBY_PLATFORM && ents.include?(win_expected_filename.force_encoding("ASCII-8BIT")))

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


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