shyouhei	2010-06-10 14:51:03 +0900 (Thu, 10 Jun 2010)

  New Revision: 28249

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

  Log:
    merge revision(s) 25342:

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28248)
+++ ruby_1_8_7/ChangeLog	(revision 28249)
@@ -1,3 +1,8 @@
+Thu Jun 10 14:39:35 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/iconv/test_option.rb: removed particular implementation specific tests.
+	  [ruby-dev:40078]
+
 Thu Jun 10 14:22:09 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize):
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28248)
+++ ruby_1_8_7/version.h	(revision 28249)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-10"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100610
-#define RUBY_PATCHLEVEL 293
+#define RUBY_PATCHLEVEL 294
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/iconv/test_option.rb
===================================================================
--- ruby_1_8_7/test/iconv/test_option.rb	(revision 28248)
+++ ruby_1_8_7/test/iconv/test_option.rb	(revision 28249)
@@ -28,4 +28,4 @@
     assert_equal(SJIS_STR, str)
     iconv.close
   end
-end if defined?(TestIconv)
+end if false and defined?(TestIconv)

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