]> git.saurik.com Git - apt.git/commit - apt-pkg/deb/debmetaindex.cc
Merge remote-tracking branch 'mvo/feature/build-dep-dsc2' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Thu, 8 May 2014 12:29:30 +0000 (14:29 +0200)
committerMichael Vogt <mvo@debian.org>
Thu, 8 May 2014 12:29:30 +0000 (14:29 +0200)
commit070536e61cb203a9c74013be2a26322b582a9674
tree9126356edcc1e239c6d87e3cb2921318238d501b
parent1816266852b25faec4f2ed1a67171eddb39b2102
parent77da39b95870498431fc21df65900acc5ce2f7ea
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
apt-pkg/deb/debindexfile.cc
apt-pkg/deb/debindexfile.h
apt-pkg/deb/debmetaindex.cc
apt-pkg/deb/debsrcrecords.cc
apt-pkg/sourcelist.h
cmdline/apt-get.cc