diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-04-08 12:24:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-04-08 12:24:50 +0200 |
| commit | 460f0f95b22c36ddc5f184cef33c54a482b5f112 (patch) | |
| tree | 324f78bd2fdddd6131301129d67fad5e9bf36871 /test/integration/test-apt-cdrom | |
| parent | 0c235e5d6658bebe3daab6c708d112b3794fd809 (diff) | |
| parent | d5cf8851753dde4f45bfd3b48fcdf34247a8752a (diff) | |
Merge remote-tracking branch 'origin/debian/jessie' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'test/integration/test-apt-cdrom')
0 files changed, 0 insertions, 0 deletions