summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-01 09:41:08 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-01 09:41:08 +0000
commitb1bcb8265d7a06efeb876a9d70997ff50e90296d (patch)
tree92ae4e5642445d76568b1cadbfb2aa7bd821b9ed /ChangeLog
parentffdaca1d748804f2b5ca2de612f17cf6c78d351b (diff)
merge revision(s) r33525: [Backport #6104]
* file.c (rb_file_join): honor input encodings than ASCII-8BIT. [ruby-core:40338] [Bug #5483] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34865 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 49ad8fee91..4c30ee8113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 1 18:39:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_join): honor input encodings than ASCII-8BIT.
+ [ruby-core:40338] [Bug #5483]
+
Tue Feb 28 11:56:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (debugflags): check if -ggdb is accepted.