]> git.saurik.com Git - apt.git/commitdiff
projects / apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2004d64 45dc05f)
Merge remote-tracking branch 'upstream/debian/sid' into feature/upgrade-with-new
authorMichael Vogt <mvo@debian.org>
Wed, 28 Aug 2013 10:46:49 +0000 (12:46 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 28 Aug 2013 10:46:49 +0000 (12:46 +0200)
1  2 
apt-private/private-cmndline.cc patch | diff1 | diff2 | blob | history
cmdline/apt-get.cc patch | diff1 | diff2 | blob | history

diff --cc apt-private/private-cmndline.cc
Simple merge
diff --cc cmdline/apt-get.cc
Simple merge
APT (for Cydia)