From a38db6daa6a30b1b578d01bd6f88393ff0c0b425 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 1 Jul 2016 12:24:01 +0200
Subject: [PATCH] TigerVNC 1.6.90 (1.7.0 beta)

---
 CMakeLists.txt             | 4 ++--
 java/CMakeLists.txt        | 2 +-
 unix/xserver/hw/vnc/xvnc.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd5a23b9..d6870b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,10 @@ include(CheckCSourceRuns)
 include(CMakeMacroLibtoolFile)
 
 project(tigervnc)
-set(VERSION 1.6.80)
+set(VERSION 1.6.90)
 
 # The RC version must always be four comma-separated numbers
-set(RCVERSION 1,6,80,0)
+set(RCVERSION 1,6,90,0)
 
 # Installation paths
 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 8f698ac5..163d0304 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.6.80)
+  set(VERSION 1.6.90)
 endif()
 
 find_package(Java)
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 57098930..1bbdfa8e 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.6.80"
+#define XVNCVERSION "TigerVNC 1.6.90"
 #define XVNCCOPYRIGHT ("Copyright (C) 1999-2016 TigerVNC Team and many others (see README.txt)\n" \
                        "See http://www.tigervnc.org for information on TigerVNC.\n")
 
-- 
2.39.5