summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-30 06:21:00 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-30 06:21:00 +0000
commitdb1861fc9fa04a3f94db226f28620c236986b5d8 (patch)
tree88fec559c71cfa6bad641336fdadb3b3e4c90964
parentbe227c54827cdc75d1ee990dcca8b033e7e46aef (diff)
downloadruby-db1861fc9fa04a3f94db226f28620c236986b5d8.tar.gz
ruby-db1861fc9fa04a3f94db226f28620c236986b5d8.tar.xz
ruby-db1861fc9fa04a3f94db226f28620c236986b5d8.zip
* eval.c (rb_eval): pre-evaluate argument for unambiguous
evaluation order. [ruby-dev:26383] * lib/delegate.rb (Delegator::method_missing): forward unknown method to the destination. suggested by <christophe.poucet@gmail.com>. [ruby-talk:146776] * process.c (detach_process_watcher): terminate process watcher thread right after rb_waitpid() succeed. [ruby-talk:146430] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51511df01..8e16d46e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,7 +157,6 @@ Mon Jun 13 13:01:05 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
->>>>>>> 1.2673.2.1092
Mon Jun 13 01:54:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (sigexit): call rb_thread_signal_exit() instead of