[or-cvs] r17436: {torbrowser} Proper version number for the next release with updated Chan (torbrowser/trunk)

[ioerror at seul.org]

Author: ioerror
Date: 2008-12-01 21:48:26 -0500 (Mon, 01 Dec 2008)
New Revision: 17436

Modified:
   torbrowser/trunk/README
Log:
Proper version number for the next release with updated Changelog


Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2008-12-02 02:40:43 UTC (rev 17435)
+++ torbrowser/trunk/README	2008-12-02 02:48:26 UTC (rev 17436)
@@ -162,10 +162,9 @@
        Update Tor to 0.2.1.6-alpha
        Update Firefox to 2.0.0.16
        Update Pidgin to 2.5.1
-1.1.5: Released 2008-11-xx
+1.1.5: Released 2008-12-1
        Set AllowMultipleInstances=true, to allow Tor Browser Bundle and
-       Firefox to be run at the same time (suggested by John Brooks)>>>>>>> .r17398
-1.1.6: Planned Release
+       Firefox to be run at the same time (suggested by John Brooks)
        Update Vidalia to release 0.1.10
        Update Firefox to 2.0.0.18
        Update Tor to 0.2.1.7-alpha