[tor-commits] [arm/release] Merging krkhan's menus work

[atagar at torproject.org]

commit ccd77c1e77c30265a6d36732697854cf6afc069b
Merge: 32c6f17 62f1188
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jun 2 08:59:45 2011 -0700

    Merging krkhan's menus work

 src/cli/__init__.py   |    2 +-
 src/cli/controller.py |   17 ++-
 src/cli/menu.py       |  438 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/cli/popups.py     |    9 +-
 src/util/menuItem.py  |   39 +++++
 src/util/panel.py     |   18 ++-
 6 files changed, 518 insertions(+), 5 deletions(-)