aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-03 19:08:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-03 19:08:40 +0000
commit140929d8ba0e184a5c84ff6aa9c77ed5832eef68 (patch)
tree8a9557a97ff138622659e7d2c7f3f861d71e169a /ChangeLog
parentfc3c52eb37b145ebce2710c2cbf7662fcf0e378f (diff)
downloadruby-140929d8ba0e184a5c84ff6aa9c77ed5832eef68.tar.gz
vm.c: return the result hash
* vm.c (core_hash_merge_kwd): should return the result hash, which may be converted from and differ from the given argument. [ruby-core:62921] [Bug #9898] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 34ea527f8f..feae7487b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 4 04:08:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (core_hash_merge_kwd): should return the result hash, which
+ may be converted from and differ from the given argument.
+ [ruby-core:62921] [Bug #9898]
+
Tue Jun 3 23:32:34 2014 Tanaka Akira <akr@fsij.org>
* ruby.c (load_file_internal2): Extracted from load_file_internal.