diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
| commit | e110d7bf5675f484c06b82f621ac98bedc464865 (patch) | |
| tree | 70ce5da7ad75ccbaf4b30cf4809209993ba98b23 /.travis.yml | |
| parent | 0b58b3f8917a49d83154fd3173bca36c1d617ef0 (diff) | |
| parent | 4f6d26b4d41474aa390329b7e9cb167eb70b2821 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions