]> git.saurik.com Git - apt.git/commitdiff
Merge branch 'debian/sid' into feature/apt-manpage
authorMichael Vogt <mvo@debian.org>
Mon, 6 Jan 2014 06:51:45 +0000 (07:51 +0100)
committerMichael Vogt <mvo@debian.org>
Mon, 6 Jan 2014 06:51:45 +0000 (07:51 +0100)
1  2 
cmdline/apt.cc
doc/apt-verbatim.ent
doc/makefile

diff --cc cmdline/apt.cc
Simple merge
Simple merge
diff --cc doc/makefile
Simple merge