]> git.cworth.org Git - sup/commitdiff
projects / sup / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c89a592 5cb77d7)
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 2 Jun 2009 14:41:41 +0000 (07:41 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 2 Jun 2009 14:41:41 +0000 (07:41 -0700)
Conflicts:

lib/sup/poll.rb

1  2 
lib/sup/poll.rb patch | diff1 | diff2 | blob | history

diff --cc lib/sup/poll.rb
Simple merge
Carl's lame hacks to sup (see http://sup.rubyforge.org/)