summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-05 11:54:48 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-05 11:54:48 +0000
commit5d0c0c192cc865d8b1848667d554a848274133e7 (patch)
treeac7be4a6f84223ac474546f22524d13fb0fb946d /ChangeLog
parent8c36fa1316dfe670534a8f2ef532b866e1ca1fdb (diff)
merges r28869 from trunk into ruby_1_9_2.
-- * complex.c (nucomp_marshal_load): should check the argument. [ruby-core:31622] * rational.c (nurat_marshal_load): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c87a4c8ee3..bdae934912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 5 18:36:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * complex.c (nucomp_marshal_load): should check the argument.
+ [ruby-core:31622]
+
+ * rational.c (nurat_marshal_load): ditto
+
Mon Aug 2 16:34:32 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* thread_win32.c (native_thread_join): need to wait thread, of course.