diff options
author | Michael Vogt <mvo@debian.org> | 2013-11-29 14:39:27 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-11-29 14:39:27 +0100 |
commit | e2264d3f957694e229a9f6976fc136b8f82ad770 (patch) | |
tree | c1f0b9c64d1d60defe5ce1a89c6bc136d758a772 /apt-private/private-cmndline.cc | |
parent | fd4e73c33c20873af670ee40b549c46ee0d50801 (diff) | |
parent | c9a5f74bd57fa4fcf4e30cade8e48c5635448689 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
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)) { |