[tor-commits] [arm/master] Merging krkhan's master branch

[atagar at torproject.org]

commit 7ec67a35b780fe48ed64b552a9e210a9a9662d18
Merge: ca124f1 a110aeb
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Jul 4 08:38:02 2011 -0700

    Merging krkhan's master branch

 src/gui/__init__.py                |    2 +-
 src/gui/arm.xml                    |   74 ++++++++++++++++++----
 src/gui/controller.py              |   57 +++--------------
 src/gui/graphing/bandwidthStats.py |   37 ++++++++++--
 src/gui/graphing/graphStats.py     |  102 ++++++++++++++++++++++++++----
 src/gui/logPanel.py                |  119 ++++++++++++++++++++++++++++++++++++
 6 files changed, 309 insertions(+), 82 deletions(-)