[vidalia-svn] r4160: Update the changelog and bump to 0.2.6. (vidalia/trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-11-02 21:36:00 -0500 (Mon, 02 Nov 2009)
New Revision: 4160

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/CMakeLists.txt
Log:

Update the changelog and bump to 0.2.6.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-11-02 17:55:35 UTC (rev 4159)
+++ vidalia/trunk/CHANGELOG	2009-11-03 02:36:00 UTC (rev 4160)
@@ -1,3 +1,11 @@
+0.2.6   02-Nov-2009
+  o Remove the erroneous comma in the default vidalia.conf in the
+    Mac OS X drag-and-drop bundle, since we now dump whatever the
+    user types into a QString rather than parsing it into a
+    QStringList.
+  o Updated the Arabic, Russian and Slovenian translations.
+
+
 0.2.5   14-Oct-2009
   o Add support in the Network settings page for configuring the
     Socks4Proxy and Socks5Proxy* options that were added in

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2009-11-02 17:55:35 UTC (rev 4159)
+++ vidalia/trunk/CMakeLists.txt	2009-11-03 02:36:00 UTC (rev 4160)
@@ -14,7 +14,7 @@
 set(VER_MAJOR   "0")
 set(VER_MINOR   "2")
 set(VER_PATCH   "6")
-set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-svn")
+set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
 message(STATUS  "Configuring Vidalia ${VERSION}")
 project(Vidalia)