summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-30 22:40:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-30 22:40:02 +0100
commita300724a321a26770ccf701e0a638c7bfa93fa5c (patch)
treec7d9b316f0c4769cd9d418ca8c5ae48f5e088b7c /Makefile
parentf8ba14071c7977a0ea2d8f1882202136b7b88dce (diff)
parent8916ea3e2ca88820e6ad1d0c8823a37221f8ed88 (diff)
Merge remote-tracking branch 'dgit/dgit/experimental'
Conflicts: debian/changelog Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions