diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-07 10:59:44 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-07 10:59:44 +0000 |
commit | ce9c95293757a211bf9dcdb45908a835e5080f7d (patch) | |
tree | 1b7e1f8f8dc8eff9e634c21f1b0462e75ca56bdc /ChangeLog | |
parent | 09e1383bcf4cb28a9a55e7d25277194b0222d051 (diff) |
Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk
Conflicts:
ChangeLog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Jul 7 10:01:34 2010 Adrian Bloomer <adrian.bloomer@gmail.com> + + * numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'. + Wed Jul 7 13:22:20 2010 NAKAMURA Usaku <usa@ruby-lang.org> * file.c (ruby_find_basename): set correct baselen. @@ -24,7 +28,6 @@ Wed Jul 7 10:26:20 2010 NARUSE, Yui <naruse@ruby-lang.org> it causes false-negative exceptions. [ruby-dev:41778] * configure.in: ditto. - Tue Jul 6 22:57:21 2010 Tanaka Akira <akr@fsij.org> * io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly |