diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-22 10:41:43 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-22 10:41:43 +0000 |
| commit | 5fe5a24586ac9a698e0a9c8f0f6d4684e1d2609d (patch) | |
| tree | ad3d0872481a8aa61ba5a9aee33934fda4bfa371 /ChangeLog | |
| parent | 4fd8847d21a2c9bac43bd713a6a43ff3417ee45e (diff) | |
merge revision(s) 26534:26536:
* eval.c (proc_invoke): reverted r25975. [ruby-dev:39931]
[ruby-dev:40059]
* eval.c (rb_mod_define_method): return original block but not
bound block. [ruby-core:26984]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Sat May 22 19:36:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (proc_invoke): reverted r25975. [ruby-dev:39931] + [ruby-dev:40059] + + * eval.c (rb_mod_define_method): return original block but not + bound block. [ruby-core:26984] + Thu May 20 16:28:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/webrick/httpservlet/filehandler.rb (make_partial_content): |