[tor-commits] [arm/master] Merge commit 'krkhan/master'

[atagar at torproject.org]

commit de4b51a73316a0a4d366a9cab38707ccffa56cf0
Merge: ee6721e 5fff0b1
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Aug 11 08:24:08 2011 -0700

    Merge commit 'krkhan/master'

 src/gui/arm.xml                    |  169 +++++++++++----
 src/gui/configPanel.py             |  161 ++++++++++++++
 src/gui/connections/circEntry.py   |   37 ++--
 src/gui/connections/connEntry.py   |   48 ++---
 src/gui/connections/connPanel.py   |  134 +++++-------
 src/gui/controller.py              |   32 ++--
 src/gui/generalPanel.py            |   25 +--
 src/gui/graphing/__init__.py       |    2 +-
 src/gui/graphing/bandwidthStats.py |   12 +-
 src/gui/graphing/graphPanel.py     |  144 +++++++++++++
 src/gui/graphing/graphStats.py     |  142 -------------
 src/gui/logPanel.py                |   26 ++--
 src/starter.py                     |    2 +-
 src/util/gtkTools.py               |  405 ++++++++++++++++++++++++++++++++++++
 14 files changed, 979 insertions(+), 360 deletions(-)