summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-30 12:54:01 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-30 12:54:01 +0000
commit4de39cd34edf69376af707071f0a6fbeed90e091 (patch)
tree9e2fb3eb43345520a6848fb60eaa565a888941ad /ChangeLog
parent1e8b18dfa25d94c1d24d6d5be5172bb0cee2a987 (diff)
merges r25510 from trunk into ruby_1_9_1.
-- * lib/net/ftp.rb (getbinaryfile, list): call to_s to convert a Pathname instance into a string. [ruby-core:26237] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26509 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 b74b6884a8..c192df9f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 27 15:44:48 2009 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
+ a Pathname instance into a string. [ruby-core:26237]
+
Tue Oct 27 07:53:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (garbage_collect_with_gvl): do not garbage_collect when