From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 24 Dec 2015 20:18:02 +0000 (+0100)
Subject: TigerVNC 1.6.0
X-Git-Tag: v1.6.0^0
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2F1.6-branch;p=tigervnc.git

TigerVNC 1.6.0
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3a177b1..d249e841 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,10 @@ include(CheckCSourceRuns)
 include(CMakeMacroLibtoolFile)
 
 project(tigervnc)
-set(VERSION 1.5.90)
+set(VERSION 1.6.0)
 
 # The RC version must always be four comma-separated numbers
-set(RCVERSION 1,5,90,0)
+set(RCVERSION 1,6,0,0)
 
 # Installation paths
 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 56535c61..15ee65fb 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 project(tigervnc-java Java)
 if(NOT VERSION)
-  set(VERSION 1.5.90)
+  set(VERSION 1.6.0)
 endif()
 
 find_package(Java)
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index f3696e10..e330a673 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -85,7 +85,7 @@ from the X Consortium.
 #include "version-config.h"
 #include "site.h"
 
-#define XVNCVERSION "TigerVNC 1.5.90"
+#define XVNCVERSION "TigerVNC 1.6.0"
 #define XVNCCOPYRIGHT ("Copyright (C) 1999-2015 TigerVNC Team and many others (see README.txt)\n" \
                        "See http://www.tigervnc.org for information on TigerVNC.\n")