aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2012-03-09 20:34:29 +0000
committerDRC <dcommander@users.sourceforge.net>2012-03-09 20:34:29 +0000
commitf2d1a3a090c8e3df41458ff7c87719dbd3f3be64 (patch)
treee1aae87b2ecca9e6dfca82c026104310bb1c510e
parent27b0e7340ac3055623b6320e08b3771784d2b72b (diff)
downloadtigervnc-f2d1a3a090c8e3df41458ff7c87719dbd3f3be64.tar.gz
tigervnc-f2d1a3a090c8e3df41458ff7c87719dbd3f3be64.zip
Bump version to 1.2.0v1.2.01.2-branch
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_2@4862 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--CMakeLists.txt4
-rw-r--r--java/CMakeLists.txt2
-rw-r--r--unix/xserver/hw/vnc/xvnc.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f84b30f..65840107 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,10 @@ include(CheckCSourceRuns)
include(CMakeMacroLibtoolFile)
project(tigervnc)
-set(VERSION 1.1.91)
+set(VERSION 1.2.0)
# The RC version must always be four comma-separated numbers
-set(RCVERSION 1,1,91,0)
+set(RCVERSION 1,2,0,0)
# Compatibility variables for the migration from autotools
add_definitions(-DPACKAGE_NAME="${CMAKE_PROJECT_NAME}")
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index f0a884b8..5125067c 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8)
project(tigervnc-java Java)
-set(VERSION 1.1.91)
+set(VERSION 1.2.0)
find_package(Java)
diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index 05d4eb12..70bf74e3 100644
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -96,7 +96,7 @@ extern "C" {
#define Xfree free
#endif
-#define XVNCVERSION "TigerVNC 1.1.91"
+#define XVNCVERSION "TigerVNC 1.2.0"
#define XVNCCOPYRIGHT ("Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" \
"See http://www.tigervnc.org for information on TigerVNC.\n")