From 13991a15faa9e5623e4b4fba8795bb7aac115dc9 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 18 Oct 2014 21:15:00 -0400 Subject: Increase version string to 1.15.2.1-xp+vc2013+x2go1 --- include/dix-config.h | 2 +- xorg-server/hw/xwin/XWin.rc | 4 ++-- xorg-server/installer/vcxsrv-64-debug.nsi | 2 +- xorg-server/installer/vcxsrv-64.nsi | 2 +- xorg-server/installer/vcxsrv-debug.nsi | 2 +- xorg-server/installer/vcxsrv.nsi | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/dix-config.h b/include/dix-config.h index beca20992..b1d72855b 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) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((2) * 1000) + 1) /* 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 ffcee3f23..a23cdf969 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -45,9 +45,9 @@ FONT 8, "MS Shell Dlg 2" BEGIN CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 - LTEXT "https://sourceforge.net/u/mikedep333/vcxsrv/ci/master/tree/", IDC_STATIC, 36, 18, 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.0-xp+vc2013+x2go1 (2 Sept 2014)", IDC_STATIC, 36, 38, 220, 8 + LTEXT "Version 1.15.2.1-xp+vc2013+x2go1 (18 Oct 2014)", 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 355be58eb..a4cad246b 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.0-xp+vc2013+x2go1.installer.exe" +OutFile "vcxsrv-64-debug.1.15.2.1-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 5440a56d9..03ab0f6ad 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.0-xp+vc2013+x2go1.installer.exe" +OutFile "vcxsrv-64.1.15.2.1-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 ffc83eaf2..8fbd8fe76 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.0-xp+vc2013+x2go1.installer.exe" +OutFile "vcxsrv-debug.1.15.2.1-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 e3b3f4562..12cf4bfe4 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.0-xp+vc2013+x2go1.installer.exe" +OutFile "vcxsrv.1.15.2.1-xp+vc2013+x2go1.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv -- cgit v1.2.3