summaryrefslogtreecommitdiff
path: root/cmdline/apt-config.cc
diff options
context:
space:
mode:
authorbubulle@debian.org <>2006-08-21 10:55:15 -0500
committerbubulle@debian.org <>2006-08-21 10:55:15 -0500
commit3784e34677882fbea8538baa1c25b0d35abf429a (patch)
tree2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /cmdline/apt-config.cc
parent8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff)
parent02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff)
Merge with Michael and resolve conflicts
Diffstat (limited to 'cmdline/apt-config.cc')
0 files changed, 0 insertions, 0 deletions