summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-19 11:56:22 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-19 11:56:22 +0000
commitcfe710763e7eb44555cd01999534ed569e9fbf44 (patch)
tree7cd47ee99ede0bd1ce681a2a709288b4fce5694a /ChangeLog
parent09f5560c5721ad779cc2e740c4a77ad6aca1b530 (diff)
Merge this too.
* lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb, test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9. [ruby-dev:31318] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16085 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 1cce913a59..0fd21adedf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 19 20:54:42 2008 akira yamada <akira@arika.org>
+
+ * lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
+ test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
+ [ruby-dev:31318]
+
Sat Apr 19 20:35:02 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance