]> git.saurik.com Git - apt.git/commit
projects / apt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 79e85ea 5afcfe2)
Merge branch 'debian/sid' into debian/experimental
authorDavid Kalnischkies <david@kalnischkies.de>
Wed, 15 Oct 2014 16:32:14 +0000 (18:32 +0200)
committerDavid Kalnischkies <david@kalnischkies.de>
Wed, 15 Oct 2014 16:32:14 +0000 (18:32 +0200)
commit0977f81757f42889a9edb761061529041afe0a06
treeb8ccdbd39bce1a82de8afc587c9bbe5becfe2913tree | snapshot
parent79e85ea6054c9f34572f06598f73782466b164a8commit | diff
parent5afcfe2a51a9e47e95023b99bcab065d1975e950commit | 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
apt-pkg/acquire-item.cc diff1 | diff2 | blob | history
test/integration/test-apt-cdrom diff1 | diff2 | blob | history
APT (for Cydia)