summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-30 12:48:07 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-30 12:48:07 +0000
commit965258fae39c4e21216c58b077204fb65f174f16 (patch)
tree9c98259333474c06c38707df5fbc1f6b05dae47a /ChangeLog
parent4fe744b10706a62196957d1d9c45e1f63f9dfdd9 (diff)
merges r25343 from trunk into ruby_1_9_1.
-- * ext/iconv/iconv.c (iconv_create): cannot retry with given block. [ruby-dev:39487] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26487 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 920e36c0b8..56510a5cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 15 14:20:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (iconv_create): cannot retry with given block.
+ [ruby-dev:39487]
+
Thu Oct 15 09:25:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK