commit ced6b222368d99588948cdc4da6f4efd59193070 Merge: eec3363 86ec8d9 Author: Tomás Touceda chiiph@torproject.org Date: Fri Sep 16 10:53:35 2011 -0300

Merge branch 'bug2188_bwgraph' into alpha

changes/bug2188 | 2 + src/vidalia/bwgraph/GraphFrame.cpp | 45 ++++++++++++++++++++++++++++++----- src/vidalia/bwgraph/GraphFrame.h | 4 +++ 3 files changed, 44 insertions(+), 7 deletions(-)