]> git.cworth.org Git - sup/commitdiff
projects / sup / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20886f4 e459fc8)
Merge branch 'hook-local-vars' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 23 Aug 2009 17:24:59 +0000 (13:24 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 23 Aug 2009 17:24:59 +0000 (13:24 -0400)
Conflicts:
lib/sup/hook.rb

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

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