diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-29 13:39:45 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-29 13:39:45 +0100 |
| commit | e4a93f90b2e50f6833f7146496e574a5a9cedaca (patch) | |
| tree | 836dd5e70b394f9996d4af0bdfcd52d2a388a007 /apt-private/private-cmndline.cc | |
| parent | fdef7c5e3a19c5f35ee952598124d0fe8d03c7ec (diff) | |
| parent | faeb435cab7b41a50c621ef9f96853d15c57d0d8 (diff) | |
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Conflicts:
apt-private/private-cmndline.cc
Diffstat (limited to 'apt-private/private-cmndline.cc')
| -rw-r--r-- | apt-private/private-cmndline.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index f4348c979..28309af07 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -226,8 +226,8 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm { 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)) { |