summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:34:03 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:34:03 +0000
commitdf359ef46299a90cc4d0960d0788ea499092d124 (patch)
tree714c584ef772e9e91c3e2339bbfe4ca05bd5a772 /ChangeLog
parentb1e7a961d2b728a66cf1c0a706de344b2b78e812 (diff)
merges r24401 from trunk into ruby_1_9_1.
-- * eval.c (rb_longjmp): reset raised flag before fatal error. * eval_error.c (error_print): file can be NULL. line can be 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24467 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 10307b8678..585e2d7784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 5 12:39:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_longjmp): reset raised flag before fatal error.
+
+ * eval_error.c (error_print): file can be NULL. line can be 0.
+
Wed Aug 5 01:38:27 2009 Yusuke Endoh <mame@tsg.ne.jp>
* lib/pp.rb (guard_inspect_key): untrust internal hash to prevent