nobu	2012-02-23 00:15:17 +0900 (Thu, 23 Feb 2012)

  New Revision: 34751

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

  Log:
    merge revision(s) 34750:
    
    * test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/iconv/test_option.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34750)
+++ ruby_1_9_3/ChangeLog	(revision 34751)
@@ -1,3 +1,7 @@
+Wed Feb 22 23:27:52 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]
+
 Wed Feb 22 22:04:15 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_s_foreach): argument check before making Enumerator.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34750)
+++ ruby_1_9_3/version.h	(revision 34751)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 138
+#define RUBY_PATCHLEVEL 139
 
 #define RUBY_RELEASE_DATE "2012-02-22"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/iconv/test_option.rb
===================================================================
--- ruby_1_9_3/test/iconv/test_option.rb	(revision 34750)
+++ ruby_1_9_3/test/iconv/test_option.rb	(revision 34751)
@@ -40,4 +40,4 @@
     assert_equal(SJIS_STR, str)
     iconv.close
   end
-end if false and defined?(TestIconv)
+end if defined?(TestIconv)

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