Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge revision(s) 25342:

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@28249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 6ac439ce46ff4cc34837627a29916575e1150393 1 parent a72e067
@shyouhei shyouhei authored
Showing with 7 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1  test/iconv/test_option.rb
  3. +1 −1  version.h
View
5 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):
View
2  test/iconv/test_option.rb
@@ -28,4 +28,4 @@ def test_translit_option
assert_equal(SJIS_STR, str)
iconv.close
end
-end if defined?(TestIconv)
+end if false and defined?(TestIconv)
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.