diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
| commit | afaeea148553439684e6091f282bf5a4ee5c00d6 (patch) | |
| tree | 9de4549d414a78bed64a2a20f7941695c7d6c4df /apt-pkg/acquire-method.h | |
| parent | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (diff) | |
| parent | eea0f3a6197dba565c5df349ed06c0a70b49b77f (diff) | |
Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'apt-pkg/acquire-method.h')
0 files changed, 0 insertions, 0 deletions