summaryrefslogtreecommitdiff
path: root/apt-pkg/init.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-10-15 18:32:14 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-10-15 18:32:14 +0200
commit0977f81757f42889a9edb761061529041afe0a06 (patch)
treeb8ccdbd39bce1a82de8afc587c9bbe5becfe2913 /apt-pkg/init.cc
parent79e85ea6054c9f34572f06598f73782466b164a8 (diff)
parent5afcfe2a51a9e47e95023b99bcab065d1975e950 (diff)
Merge branch 'debian/sid' into debian/experimental
The acquire code changed completely, so this is more an import of the testcase and a new fix than the merge of an existent fix. Conflicts: apt-pkg/acquire-item.cc
Diffstat (limited to 'apt-pkg/init.cc')
0 files changed, 0 insertions, 0 deletions