]> git.cworth.org Git - sup/commit
Merge branch 'locking-refactor'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 25 Aug 2009 13:51:15 +0000 (09:51 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 25 Aug 2009 13:51:38 +0000 (09:51 -0400)
commitda1abd360e25011bdbe23b9194f926f29b8aef44
treeac08857bd2457c12fdb1aedd4d74ea2996df72d7
parentfc260ddb62efcd26747e41d1c8a098bda3174d42
parent57dea7ad93bb15491cd33281d933ca4ef6440e45
Merge branch 'locking-refactor'

Conflicts:
bin/sup
bin/sup-sync-back
bin/sup-tweak-labels
lib/sup.rb
lib/sup/suicide.rb
bin/sup
bin/sup-add
bin/sup-sync
bin/sup-sync-back
bin/sup-tweak-labels
lib/sup.rb
lib/sup/index.rb
lib/sup/util.rb