summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-02 04:32:45 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-02 04:32:45 +0000
commit968b8e0199c0d7cfd04323b7771fa27365f9965c (patch)
tree650679dfaf03e387147f74fbb188e91838a4df0f /ChangeLog
parent96d14df44eb058e1bc16626ed92af14ebdd602c1 (diff)
* lib/net/http.rb (canonical_each): fix merge miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 58c074cef7..61c5eaeee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 2 13:31:51 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/net/http.rb (canonical_each): fix merge miss.
+
Mon Feb 2 01:54:00 2004 Tanaka Akira <akr@m17n.org>
* lib/pp.rb (Struct#pretty_print): make it 1.8 style.