[tor-commits] [vidalia/master] Bump version to 0.2.18

[chiiph at torproject.org]

commit 1c9c8a94148602d625990080f978a80e477485a6
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon May 14 09:42:31 2012 -0300

    Bump version to 0.2.18
---
 CMakeLists.txt |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 498041c..cdab126 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
 ##
 ##  $Id$
-## 
+##
 ##  This file is part of Vidalia, and is subject to the license terms in the
-##  LICENSE file, found in the top level directory of this distribution. If 
+##  LICENSE file, found in the top level directory of this distribution. If
 ##  you did not receive the LICENSE file with this file, you may obtain it
 ##  from the Vidalia source package distributed by the Vidalia Project at
-##  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
-##  including this file, may be copied, modified, propagated, or distributed 
+##  http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+##  including this file, may be copied, modified, propagated, or distributed
 ##  except according to the terms described in the LICENSE file.
 ##
 
@@ -14,7 +14,7 @@
 set(VER_MAJOR   "0")
 set(VER_MINOR   "2")
 set(VER_PATCH   "18")
-set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git")
+set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
 message(STATUS  "Configuring Vidalia ${VERSION}")
 project(Vidalia)
 
@@ -61,7 +61,7 @@ if(MSVC_IDE)
     set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
     set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 endif(MSVC_IDE)
-  
+
 ## Define Vidalia-specific CMake options
 if (APPLE)
   option(OSX_TIGER_COMPAT "Build an OS X 10.4 Compatible Vidalia." OFF)
@@ -74,7 +74,7 @@ if (APPLE)
 
   option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF)
   if (OSX_FAT_BINARY)
-    set(CMAKE_OSX_ARCHITECTURES "ppc;i386" 
+    set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
         CACHE STRING "OS X build architectures" FORCE)
     set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4"
         CACHE STRING "Flags used by the linker." FORCE)
@@ -85,7 +85,7 @@ if (APPLE)
   option(OSX_FORCE_32BIT "Force a 32-bit build for compatibility." OFF)
   if (OSX_FORCE_32BIT)
     add_definitions(-m32)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" 
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32"
         CACHE STRING "Flags used by the linker." FORCE)
   endif(OSX_FORCE_32BIT)
 endif(APPLE)