[vidalia-svn] r1883: Bump to 0.0.14, add one last changelog item, and give 0.0.14 (in trunk: . pkg/win32 src src/gui/res)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-26 01:35:08 -0400 (Sun, 26 Aug 2007)
New Revision: 1883

Modified:
   trunk/
   trunk/CHANGELOG
   trunk/configure.in
   trunk/pkg/win32/vidalia-bundle.nsi
   trunk/pkg/win32/vidalia.nsi
   trunk/src/gui/res/vidalia_win.rc
   trunk/src/vidalia.h
Log:
 r2086@adrastea:  edmanm | 2007-08-26 01:34:54 -0400
 Bump to 0.0.14, add one last changelog item, and give 0.0.14 a date.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2086] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-08-26 05:27:40 UTC (rev 1882)
+++ trunk/CHANGELOG	2007-08-26 05:35:08 UTC (rev 1883)
@@ -1,8 +1,11 @@
-0.0.14  ??-Aug-2007
+0.0.14  26-Aug-2007
   o Add support for Tor's HashedControlPassword and CookieAuthentication
     options. Password authentication is enabled by default.
   o Add support for Tor's new PROTOCOLINFO control command.
   o Support running on Windows NT 4.0 again.
+  o Check to see if "%PROGRAMFILES%\Vidalia Bundle\Tor\tor.exe" exists when
+    setting the default Tor executable on Win32. If it doesn't, fall back to
+    "%PROGRAMFILES%\Tor\tor.exe". (Ticket #262)
   o Allow the people who think clicking 'New Identity' is the solution to
     everything to be disappointed six times per minute, instead of once.
   o Add the ability to configure Tor's data directory.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-08-26 05:27:40 UTC (rev 1882)
+++ trunk/configure.in	2007-08-26 05:35:08 UTC (rev 1883)
@@ -1,4 +1,4 @@
-AC_INIT(vidalia,0.0.14-svn)
+AC_INIT(vidalia,0.0.14)
 AC_MSG_NOTICE([Configuring AC_PACKAGE_STRING...])
 AC_PROG_CXX
 PROFILE="Vidalia.pro"

Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi	2007-08-26 05:27:40 UTC (rev 1882)
+++ trunk/pkg/win32/vidalia-bundle.nsi	2007-08-26 05:35:08 UTC (rev 1883)
@@ -32,7 +32,7 @@
 
 !define VIDALIA_NAME        "Vidalia"
 !define VIDALIA_EXEC        "vidalia.exe"
-!define VIDALIA_APPVERSION  "0.0.14-svn"
+!define VIDALIA_APPVERSION  "0.0.14"
 !define VIDALIA_DESC        "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
 
 !define TOR_NAME            "Tor"

Modified: trunk/pkg/win32/vidalia.nsi
===================================================================
--- trunk/pkg/win32/vidalia.nsi	2007-08-26 05:27:40 UTC (rev 1882)
+++ trunk/pkg/win32/vidalia.nsi	2007-08-26 05:35:08 UTC (rev 1883)
@@ -29,7 +29,7 @@
 ; Global definitions
 !define VIDALIA_NAME        "Vidalia"
 !define VIDALIA_EXEC        "vidalia.exe"
-!define VIDALIA_APPVERSION  "0.0.14-svn"
+!define VIDALIA_APPVERSION  "0.0.14"
 !define VIDALIA_PRODVERSION "0.0.14.0" ; Product version must be x.x.x.x
 !define VIDALIA_AUTHORS     "Matt Edman, Justin Hipple"
 !define VIDALIA_INSTALLFILE "vidalia-${VIDALIA_APPVERSION}.exe"

Modified: trunk/src/gui/res/vidalia_win.rc
===================================================================
--- trunk/src/gui/res/vidalia_win.rc	2007-08-26 05:27:40 UTC (rev 1882)
+++ trunk/src/gui/res/vidalia_win.rc	2007-08-26 05:35:08 UTC (rev 1883)
@@ -39,8 +39,8 @@
     {
         BLOCK "040904E4"
         {
-            VALUE "FileVersion",      "0.0.14-svn"
-            VALUE "ProductVersion",   "0.0.14-svn"
+            VALUE "FileVersion",      "0.0.14"
+            VALUE "ProductVersion",   "0.0.14"
             VALUE "FileDescription",  "Vidalia"
             VALUE "InternalName",     "Vidalia"
             VALUE "ProductName",      "Vidalia"

Modified: trunk/src/vidalia.h
===================================================================
--- trunk/src/vidalia.h	2007-08-26 05:27:40 UTC (rev 1882)
+++ trunk/src/vidalia.h	2007-08-26 05:35:08 UTC (rev 1883)
@@ -43,7 +43,7 @@
 #include <control/torcontrol.h>
 
 /** Vidalia's version string */
-#define VIDALIA_VERSION    "0.0.14-svn"
+#define VIDALIA_VERSION    "0.0.14"
 
 /** Pointer to this Vidalia application instance. */
 #define vApp  ((Vidalia *)qApp)