summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-28 23:18:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-28 23:18:52 +0100
commitd1c14131ff8c1e9e0b0b005cb065a952b6631e3c (patch)
tree6f33308d8ee39e05569a0b2582804ef73e8d888e /Makefile
parentfc461931e5316cbd9cad4a93b9bbac3ad69c81a4 (diff)
parent28789232f5edcc1c24bbb4bfe3b5e12119e9886e (diff)
Merge branch 'master' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into dgit/experimental
Conflicts: debian/changelog
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions