summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:09:35 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:09:35 +0000
commit6b00ba5ccc6f57c62a2b5f52511beb7acad2ef81 (patch)
treed7a52c3be512e77e12e1479066cf389e54ccd0ea /ChangeLog
parent3dd98cb1a51484fbe253d56615fc50bf16611084 (diff)
merge revision(s) 16074:
* ext/syck/rubyext.c: Node#value defined twice. * lib/yaml/: several method redefinitions causing warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 96afef2d1c..1053b6b4c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 22:09:02 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/syck/rubyext.c: Node#value defined twice.
+
+ * lib/yaml/: several method redefinitions causing warnings.
+
Sun Jun 15 22:04:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (w_object): add volatile to avoid potential GC bug. a