]> git.saurik.com Git - apt.git/commitdiff
projects / apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 314b475 4694e07)
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
authorMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 14:17:08 +0000 (16:17 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 14:17:08 +0000 (16:17 +0200)
Conflicts:
apt-pkg/deb/dpkgpm.cc

1  2 
apt-pkg/deb/deblistparser.cc patch | diff1 | diff2 | blob | history
methods/https.cc patch | diff1 | diff2 | blob | history

diff --cc apt-pkg/deb/deblistparser.cc
Simple merge
diff --cc methods/https.cc
Simple merge
APT (for Cydia)