From a0efdbbb6b35efb2581e3a7dcdef3abca2dcd3dd Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 10 Jun 2010 05:51:03 +0000 Subject: 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 --- ChangeLog | 5 +++++ test/iconv/test_option.rb | 2 +- version.h | 2 +- 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 + + * test/iconv/test_option.rb: removed particular implementation specific tests. + [ruby-dev:40078] + Thu Jun 10 14:22:09 2010 URABE Shyouhei * 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 -- cgit v1.2.3