summaryrefslogtreecommitdiff
path: root/apt-pkg/aptconfiguration.h
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-28 20:29:54 +0100
committerMichael Vogt <mvo@debian.org>2014-02-28 20:29:54 +0100
commitfa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (patch)
treeb879ccfbc9dba7a797ebe3414e1efed6737d6630 /apt-pkg/aptconfiguration.h
parent8c55d4d117f1641650cd832c957ccdbf71b04893 (diff)
parenta4a5901577a2b0d72f1c973f036a8198046d937a (diff)
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'apt-pkg/aptconfiguration.h')
0 files changed, 0 insertions, 0 deletions