merge revision(s) 25342:

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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 66ec395423..3c4df0d68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 10 14:39:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/iconv/test_option.rb: removed particular implementation specific tests.
+	  [ruby-dev:40078]
+
 Thu Jun 10 14:22:09 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize):
diff --git a/test/iconv/test_option.rb b/test/iconv/test_option.rb
index 8138e130fa..54f09b4c2c 100644
--- a/test/iconv/test_option.rb
+++ b/test/iconv/test_option.rb
@@ -28,4 +28,4 @@ class TestIconv::Option < TestIconv
     assert_equal(SJIS_STR, str)
     iconv.close
   end
-end if defined?(TestIconv)
+end if false and defined?(TestIconv)
diff --git a/version.h b/version.h
index 974c2b5cdf..76576a4637 100644
--- a/version.h
+++ b/version.h
@@ -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