summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-04-01 12:44:08 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-04-01 12:44:08 +0200
commit1701312682aad167b4ff3425a8e9b680c04b49a5 (patch)
tree142c5c6b1deb5c28afa40a821a917c15e7f2adbe /apt-pkg
parent035a31392a094a92eeff4371c56fae893d49991b (diff)
parentc4383ac4a47d58347afa2a45bbf31d7bc2d18b89 (diff)
Merge remote-tracking branch 'mvo/feature/apt-manpage' into debian/sid
Conflicts: cmdline/apt.cc
Diffstat (limited to 'apt-pkg')
0 files changed, 0 insertions, 0 deletions