summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-06 07:25:37 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-06 07:25:37 +0000
commit3f8c4ba70f9aaa401f1b943b7ab30e2685d7078e (patch)
treec68d03c49685ed9055a9058a97267dbf0afdb551 /ChangeLog
parent63da304fb7c849e675e762c626e074d130d1e715 (diff)
merge revision(s) 33603:
* file.c (file_expand_path): reset coderange after expanding path. [Backport #5601] [Backport #5629] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34435 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 5cae97599a..3014fd89b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 6 16:21:57 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * file.c (file_expand_path): reset coderange after expanding path.
+
Mon Feb 6 00:06:39 2012 NARUSE, Yui <naruse@ruby-lang.org>
* ext/json/parser/parser.rl (json_string_unescape): workaround fix