summaryrefslogtreecommitdiff
path: root/cmdline/apt-config.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
commitb3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch)
tree0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /cmdline/apt-config.cc
parenta1a253e8be978998b66af62240a25864db2cc694 (diff)
parent128aa7d3630f138f37ef83e3e8564feca01ec429 (diff)
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts: debian/changelog
Diffstat (limited to 'cmdline/apt-config.cc')
0 files changed, 0 insertions, 0 deletions