diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
| commit | bef425ae689899d3add1f6a26b888012803a7308 (patch) | |
| tree | 79ba0268c02129fbaaa1fb32c58904cb37ca1167 /apt-private/private-cachefile.h | |
| parent | 74ac981563c6ccfd5291b6b6b83e193afa8aa40b (diff) | |
| parent | 1c93747533dcf1cbbb2c743d0028ad157a7684a4 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
test/integration/test-kernel-helper-autoremove
Diffstat (limited to 'apt-private/private-cachefile.h')
0 files changed, 0 insertions, 0 deletions