From: Michael Vogt <mvo@debian.org>
Date: Fri, 29 Nov 2013 12:39:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
X-Git-Tag: 0.9.13.1~6
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e4a93f90b2e50f6833f7146496e574a5a9cedaca

Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Conflicts:
	apt-private/private-cmndline.cc
---

e4a93f90b2e50f6833f7146496e574a5a9cedaca
diff --cc apt-private/private-cmndline.cc
index f4348c979,35d61f318..28309af07
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@@ -226,8 -222,7 +226,8 @@@ bool addArgumentsAPT(std::vector<Comman
     {
        addArg(0,"installed","APT::Cmd::Installed",0);
        addArg(0,"upgradable","APT::Cmd::Upgradable",0);
-       addArg('a', "all-versions", "APT::Cmd::AllVersions", 0);
 +      addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
+       addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
     }
     else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
     {