]> git.saurik.com Git - apt.git/commitdiff
projects / apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9829e0 c23e6cd)
Merge remote-tracking branch 'mvo/bugfix/conffile' into debian/sid
authorMichael Vogt <mvo@debian.org>
Thu, 12 Dec 2013 17:32:44 +0000 (18:32 +0100)
committerMichael Vogt <mvo@debian.org>
Thu, 12 Dec 2013 17:32:44 +0000 (18:32 +0100)
1  2 
cmdline/apt-get.cc patch | diff1 | diff2 | blob | history

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