summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-24 13:46:04 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-24 13:46:04 +0000
commitcafc5a30805e647d7920343cc7056d95263f58b8 (patch)
tree92aa673c75956611d76dc2b2dcfa6cbeb7dd70f0 /ChangeLog
parent57b26f83051d13442ffa6269230ea9d5803b6d1b (diff)
merge revision(s) 43376: [Backport #9038]
* encoding.c (load_encoding): should preserve outer errinfo, so that expected exception may not be lost. [ruby-core:57949] [Bug #9038] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43414 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 212905a307..86d2a3d5d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 24 22:36:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (load_encoding): should preserve outer errinfo, so that
+ expected exception may not be lost. [ruby-core:57949] [Bug #9038]
+
Fri Oct 18 02:10:00 2013 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): set ci->me to 0 when the