summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-26 08:22:31 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-26 08:22:31 +0000
commit43294dff520647db9901b46c89b223f8dfe07741 (patch)
tree8fd9feed5cfb6403513ffc3316b171fc3664f03d /ChangeLog
parent48e95864987fe9aeda96899e7c9c2d7347818408 (diff)
merge revision(s) 34397: [Backport #6881]
* file.c (append_fspath): need to set the encoding to result always. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37334 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 d1e2eb4cd6..574f739826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 26 17:22:18 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (append_fspath): need to set the encoding to result always.
+
Fri Oct 26 11:03:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_enc_path_next, rb_enc_path_skip_prefix)