1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ChangeLog: remove conflict marker.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-12-05 01:23:03 +00:00
parent 32a75432b6
commit df8d84bb73
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,7 +7,6 @@ Wed Dec 5 04:04:02 2012 Masaya Tarui <tarui@ruby-lang.org>
* test/ruby/test_thread.rb (test_async_interrupt_blocking): bugfix
about defered check
>>>>>>> .r38195
Wed Dec 5 03:35:37 2012 Masaya Tarui <tarui@ruby-lang.org>
* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime.