aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-01-10 12:06:04 -0500
committerMike DePaulo <mikedep333@gmail.com>2015-01-10 12:06:04 -0500
commit15915c262c1334282d0ab2a3fdb2c416e91b51cf (patch)
treeb35ac657a3b7a1308978b90050cacf84957aeeab
parent0f3cca7b69ea6711c8f1963eb213ce8f1629091f (diff)
downloadvcxsrv-15915c262c1334282d0ab2a3fdb2c416e91b51cf.tar.gz
vcxsrv-15915c262c1334282d0ab2a3fdb2c416e91b51cf.tar.bz2
vcxsrv-15915c262c1334282d0ab2a3fdb2c416e91b51cf.zip
Increase version string to 1.15.2.2-xp+vc2013
-rw-r--r--include/dix-config.h2
-rw-r--r--xorg-server/hw/xwin/XWin.rc2
-rw-r--r--xorg-server/installer/vcxsrv-64-debug.nsi2
-rw-r--r--xorg-server/installer/vcxsrv-64.nsi2
-rw-r--r--xorg-server/installer/vcxsrv-debug.nsi2
-rw-r--r--xorg-server/installer/vcxsrv.nsi2
6 files changed, 6 insertions, 6 deletions
diff --git a/include/dix-config.h b/include/dix-config.h
index b1d72855b..34bed9694 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -366,7 +366,7 @@
#undef XORG_RELEASE
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((2) * 1000) + 1)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((2) * 1000) + 2)
/* Xorg release date */
#define XORG_DATE "10 Sept 2009"
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 239e26e15..07f88202a 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -47,7 +47,7 @@ BEGIN
LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8
LTEXT "https://sourceforge.net/u/mikedep333/vcxsrv/ci/xp-latestmsvc2013/tree/", IDC_STATIC, 36, 18, 220, 8
LTEXT "x2go-dev@lists.x2go.org", IDC_STATIC, 36, 28, 220, 8
- LTEXT "Version 1.15.2.1-xp+vc2013 (18 Oct 2014)", IDC_STATIC, 36, 38, 220, 8
+ LTEXT "Version 1.15.2.2-xp+vc2013 (10 Jan 2015)", IDC_STATIC, 36, 38, 220, 8
DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15
END
diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi
index 9aaef55e8..73c662ac1 100644
--- a/xorg-server/installer/vcxsrv-64-debug.nsi
+++ b/xorg-server/installer/vcxsrv-64-debug.nsi
@@ -21,7 +21,7 @@
Name "VcXsrv - XP Compatible"
; The file to write
-OutFile "vcxsrv-xp-64-debug.1.15.2.1.installer.exe"
+OutFile "vcxsrv-xp-64-debug.1.15.2.2.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES64\VcXsrv
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi
index 762ad5439..33ca0416d 100644
--- a/xorg-server/installer/vcxsrv-64.nsi
+++ b/xorg-server/installer/vcxsrv-64.nsi
@@ -21,7 +21,7 @@
Name "VcXsrv - XP Compatible"
; The file to write
-OutFile "vcxsrv-xp-64.1.15.2.1.installer.exe"
+OutFile "vcxsrv-xp-64.1.15.2.2.installer.exe"
; The default installation directory
InstallDir $programfiles64\VcXsrv
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index 112de0aee..4890ba021 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -21,7 +21,7 @@
Name "VcXsrv - XP Compatible"
; The file to write
-OutFile "vcxsrv-xp-debug.1.15.2.1.installer.exe"
+OutFile "vcxsrv-xp-debug.1.15.2.2.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index d4b5a5ced..f8bf6d50f 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -21,7 +21,7 @@
Name "VcXsrv - XP Compatible"
; The file to write
-OutFile "vcxsrv-xp.1.15.2.1.installer.exe"
+OutFile "vcxsrv-xp.1.15.2.2.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv