summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-06-18 10:47:19 +0200
committerMichael Vogt <mvo@debian.org>2014-06-18 10:47:57 +0200
commit17091f2f33de16c2dae501e7868f7aec4fc3452f (patch)
treef3eed549bbcb50a46d7c10aa7c3a048cf7fee166 /Makefile
parentb6fea8bbe25e3c0312de72c99b0d49c699d02b7b (diff)
parentfc1a78d8e9b958f3d65fe1c03494d785314f9816 (diff)
Merge remote-tracking branch 'mvo/feature/drop-rights' into debian/experimental
Conflicts: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/fileutl.h
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions