summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-23 13:16:28 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-23 13:16:28 +0000
commitdea79e98721e4e952021795c966639cdd109aafb (patch)
treea2b82b4f75fa51ac4a4d4d20fdd4b4b1c6cada04 /ChangeLog
parent1ae16961956c2459c0f29b676c5da9cb9cc875bf (diff)
merge revision(s) 25230:25229:
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 83b7176bea..caf327df17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 23 21:54:17 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * marshal.c, test/ruby/test_marshal.rb: Revert r25230. This test
+ is troublesome.
+
Mon Jun 21 18:12:15 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0.