diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-03 10:39:43 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-03 10:39:43 +0000 |
commit | 662ec8413c8d488b97e159f88279ae33bb636315 (patch) | |
tree | 352f27fb10b34674e3318446750285b06503980d /ChangeLog | |
parent | 54952586fd5ff136843ecf581355a3da5d328f7b (diff) |
merge revision(s) 34374:
* file.c (rmext): no extension to strip if empty string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,6 @@ -Tue Jul 3 19:18:27 2012 NARUSE, Yui <naruse@ruby-lang.org> +Tue Jul 3 19:37:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rmext): no extension to strip if empty string. * proc.c (rb_vm_rewrite_dfp_in_errinfo): Fix `unexpected return' occurs when a proc is called in ensure. [Backport #6460] |