[vidalia-svn] r3886: Looks like r3849 didn't come along for the merge. (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-24 22:56:47 -0400 (Wed, 24 Jun 2009)
New Revision: 3886

Modified:
   vidalia/trunk/src/vidalia/Vidalia.h
Log:

Looks like r3849 didn't come along for the merge.


Modified: vidalia/trunk/src/vidalia/Vidalia.h
===================================================================
--- vidalia/trunk/src/vidalia/Vidalia.h	2009-06-24 23:46:00 UTC (rev 3885)
+++ vidalia/trunk/src/vidalia/Vidalia.h	2009-06-25 02:56:47 UTC (rev 3886)
@@ -53,8 +53,6 @@
   /** Destructor. */
   ~Vidalia();
 
-  /** Return the map of command-line arguments and values. */
-  static QMap<QString, QString> arguments() { return _args; }
   /** Validates that all arguments were well-formed. */
   static bool validateArguments(QString &errmsg);
   /** Displays usage information for command-line args. */


Property changes on: vidalia/trunk/src/vidalia/Vidalia.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/branches/marble/src/vidalia/vidalia.h:3435-3484
   + /vidalia/branches/breakpad/src/vidalia/Vidalia.h:3849
/vidalia/branches/marble/src/vidalia/vidalia.h:3435-3484