]> git.cworth.org Git - sup/commitdiff
projects / sup / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 587964e 63f87a5)
Merge branch 'xapian' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 27 Jul 2009 15:59:29 +0000 (11:59 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 27 Jul 2009 15:59:29 +0000 (11:59 -0400)
Conflicts:

lib/sup/poll.rb

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

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