summaryrefslogtreecommitdiff
path: root/apt-pkg/aptconfiguration.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-05-29 12:14:42 +0200
committerMichael Vogt <mvo@debian.org>2014-05-29 12:14:42 +0200
commit1f46d14620a0b58a9239fa3faa59ba79a98f6c98 (patch)
treefd096e59115c48d15f27b1ae7376caf5ce2929dc /apt-pkg/aptconfiguration.cc
parente110d7bf5675f484c06b82f621ac98bedc464865 (diff)
parent55ef358b06854768cea247870e1d2f28a5955b90 (diff)
Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental
Conflicts: test/integration/test-bug-747261-arch-specific-conflicts
Diffstat (limited to 'apt-pkg/aptconfiguration.cc')
0 files changed, 0 insertions, 0 deletions