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:11:19 -0500
commitfaa5026e540d03f858265b2796054d685f687383 (patch)
treefbe851f1e880cd48153ebc2dbd4e76fb206a67de
parent7e1c3b94f42dfc5e52f0f724b6bf7d03e3b743e3 (diff)
downloadvcxsrv-faa5026e540d03f858265b2796054d685f687383.tar.gz
vcxsrv-faa5026e540d03f858265b2796054d685f687383.tar.bz2
vcxsrv-faa5026e540d03f858265b2796054d685f687383.zip
Increase version string to 1.15.2.2-xp+vc2013+x2go1
-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 a23cdf969..c8aadbf86 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-x2gochanges/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+x2go1 (18 Oct 2014)", IDC_STATIC, 36, 38, 220, 8
+ LTEXT "Version 1.15.2.2-xp+vc2013+x2go1 (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 a4cad246b..46c19ac17 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-64-debug.1.15.2.1-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-64-debug.1.15.2.2-xp+vc2013+x2go1.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 03ab0f6ad..994121510 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-64.1.15.2.1-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-64.1.15.2.2-xp+vc2013+x2go1.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 8fbd8fe76..a12ec9c80 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-debug.1.15.2.1-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-debug.1.15.2.2-xp+vc2013+x2go1.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 12cf4bfe4..a50f3202f 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.1.15.2.1-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv.1.15.2.2-xp+vc2013+x2go1.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv