diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-03-13 15:01:18 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-03-13 15:01:18 +0100 |
| commit | 1c01d6cc57b19e599d926d245cee30ea25826220 (patch) | |
| tree | e5edd13e551023f106bed0bb2db5a12ff2084250 /ftparchive/apt-ftparchive.h | |
| parent | ca495d048f6a6fd596b061208d28f319fa6dbcd8 (diff) | |
| parent | 1a0619ac765cc0b2f4906c96c1a4d7f510569a3f (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'ftparchive/apt-ftparchive.h')
0 files changed, 0 insertions, 0 deletions