aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2015-07-11 15:00:36 +0200
committerPierre Ossman <ossman@cendio.se>2015-07-11 15:00:36 +0200
commit2fa57a29f1d40ebf018a52e59ac374680ce77ead (patch)
tree94b727f9b4d798dcbc649f0ff1bd9244fbf50783
parent9e1a17eab02965ac060c73e89790828b2a511020 (diff)
downloadtigervnc-1.5-branch.tar.gz
tigervnc-1.5-branch.zip
TigerVNC 1.5.0v1.5.01.5-branch
-rw-r--r--CMakeLists.txt4
-rw-r--r--java/CMakeLists.txt2
-rw-r--r--unix/xserver/hw/vnc/xvnc.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16d9b0cb..672dffa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,10 @@ include(CheckCSourceRuns)
include(CMakeMacroLibtoolFile)
project(tigervnc)
-set(VERSION 1.4.90)
+set(VERSION 1.5.0)
# The RC version must always be four comma-separated numbers
-set(RCVERSION 1,4,90,0)
+set(RCVERSION 1,5,0,0)
# Installation paths
set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 00dd1a70..1a5fe147 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.4.90)
+ set(VERSION 1.5.0)
endif()
find_package(Java)
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 7cd70ffb..43f3de00 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.4.90"
+#define XVNCVERSION "TigerVNC 1.5.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")