[tor-commits] [vidalia/alpha] Merge branch '2727_network_view_panes' into alpha

[chiiph at torproject.org]

commit 565a161bade734c73fbdc83331549e0486837c78
Merge: 8c67821 47b6646
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Mar 30 17:08:43 2012 -0300

    Merge branch '2727_network_view_panes' into alpha

 changes/bug2727                   |    3 +
 src/vidalia/network/NetViewer.cpp |   33 ++-
 src/vidalia/network/NetViewer.h   |    2 +
 src/vidalia/network/NetViewer.ui  |  618 ++++++++++++++++++++-----------------
 4 files changed, 364 insertions(+), 292 deletions(-)