[vidalia-svn] r3622: Backport r3522. (in vidalia/branches/vidalia-0.1: . src/vidalia/help/browser)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-16 15:45:20 -0400 (Mon, 16 Mar 2009)
New Revision: 3622

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/help/browser/helpbrowser.cpp
Log:

Backport r3522.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3524-3526,3528,3530
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-16 19:30:44 UTC (rev 3621)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-16 19:45:20 UTC (rev 3622)
@@ -9,6 +9,7 @@
   o Remove the code that altered PublishServerDescriptor when becoming a
     bridge, since Tor handles that itself now, and ensure that BridgeRelay
     is reset when going from bridge to just-a-client mode.
+  o Remove an unnecessary #include from helpbrowser.cpp.
   o Add an application icon based on Tor's logo to the vidalia.desktop
     file.
 

Modified: vidalia/branches/vidalia-0.1/src/vidalia/help/browser/helpbrowser.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/help/browser/helpbrowser.cpp	2009-03-16 19:30:44 UTC (rev 3621)
+++ vidalia/branches/vidalia-0.1/src/vidalia/help/browser/helpbrowser.cpp	2009-03-16 19:45:20 UTC (rev 3622)
@@ -17,7 +17,6 @@
 #include <QDomDocument>
 #include <QDir>
 #include <vidalia.h>
-#include <mainwindow.h>
 
 #include "helpbrowser.h"