]> git.cworth.org Git - sup/commit
Merge branch 'console-mode' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 18 Aug 2009 18:01:06 +0000 (14:01 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 18 Aug 2009 18:26:20 +0000 (14:26 -0400)
commited7ec99d5a1c42c53ad94c81832a7ba73b14fadc
tree84270c13a79e3ac7708922787f4cbfdbb7f66ed3
parentf606a8d522389c184fd21dd96e365d56de7d0e0e
parentda6a682e67731a4f76095bfd36b245e7b8f11374
Merge branch 'console-mode' into next

Conflicts:
bin/sup
bin/sup
lib/sup.rb
lib/sup/hook.rb
lib/sup/modes/console-mode.rb