]> git.decadent.org.uk Git - dak.git/commitdiff
projects / dak.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d548bd 28b86b1)
Merge branch 'master' into auto-decruft-passive
authorNiels Thykier <niels@thykier.net>
Thu, 11 Jun 2015 11:36:04 +0000 (13:36 +0200)
committerNiels Thykier <niels@thykier.net>
Thu, 11 Jun 2015 11:36:04 +0000 (13:36 +0200)
Conflicts:
dak/generate_filelist.py

1  2 
dak/dak.py patch | diff1 | diff2 | blob | history

diff --cc dak/dak.py
Simple merge
dak changes to support and test code signing