summaryrefslogtreecommitdiff
path: root/test/libapt/globalerror_test.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-05-08 14:29:30 +0200
committerMichael Vogt <mvo@debian.org>2014-05-08 14:29:30 +0200
commit070536e61cb203a9c74013be2a26322b582a9674 (patch)
tree9126356edcc1e239c6d87e3cb2921318238d501b /test/libapt/globalerror_test.cc
parent1816266852b25faec4f2ed1a67171eddb39b2102 (diff)
parent77da39b95870498431fc21df65900acc5ce2f7ea (diff)
Merge remote-tracking branch 'mvo/feature/build-dep-dsc2' into debian/experimental
Conflicts: apt-pkg/deb/debindexfile.cc apt-pkg/deb/debindexfile.h apt-pkg/deb/debsrcrecords.cc
Diffstat (limited to 'test/libapt/globalerror_test.cc')
0 files changed, 0 insertions, 0 deletions