]> git.saurik.com Git - apt.git/commitdiff
projects / apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38d2959 aaf677d)
Merge remote-tracking branch 'mvo/feature/apt-install-deb' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 16:10:52 +0000 (18:10 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 7 May 2014 16:10:52 +0000 (18:10 +0200)
1  2 
apt-pkg/acquire-item.cc patch | diff1 | diff2 | blob | history
apt-pkg/contrib/fileutl.cc patch | diff1 | diff2 | blob | history
apt-pkg/contrib/fileutl.h patch | diff1 | diff2 | blob | history

diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc apt-pkg/contrib/fileutl.cc
Simple merge
diff --cc apt-pkg/contrib/fileutl.h
Simple merge
APT (for Cydia)