diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
| commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
| tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /apt-pkg/acquire-worker.cc | |
| parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
| parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) | |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'apt-pkg/acquire-worker.cc')
0 files changed, 0 insertions, 0 deletions