]> git.cworth.org Git - sup/commitdiff
projects / sup / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bee999a eb28079)
Merge branch 'xapian'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 3 Aug 2009 16:29:26 +0000 (12:29 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 3 Aug 2009 16:29:26 +0000 (12:29 -0400)
Conflicts:
lib/sup/index.rb

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

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