aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-02-28 07:49:50 -0500
committerMike DePaulo <mikedep333@gmail.com>2015-02-28 18:16:24 -0500
commit13caba89a47f48cac9ee7e754e61d7565063354a (patch)
tree3ab385141f95cb71f4ff4dfb0699845aec26beb1 /xorg-server
parent08e3c3278cbabc9c801c47f20046e51666bb7b1c (diff)
downloadvcxsrv-13caba89a47f48cac9ee7e754e61d7565063354a.tar.gz
vcxsrv-13caba89a47f48cac9ee7e754e61d7565063354a.tar.bz2
vcxsrv-13caba89a47f48cac9ee7e754e61d7565063354a.zip
Increase version string to 1.15.2.41.15.2.4-xp+vc2013+x2go1
Conflicts: xorg-server/hw/xwin/XWin.rc xorg-server/installer/vcxsrv-64-debug.nsi xorg-server/installer/vcxsrv-64.nsi xorg-server/installer/vcxsrv-debug.nsi xorg-server/installer/vcxsrv.nsi
Diffstat (limited to 'xorg-server')
-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
5 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 3cff699ca..d31b32ba8 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.3-xp+vc2013+x2go1 (20 Feb 2015)", IDC_STATIC, 36, 38, 220, 8
+ LTEXT "Version 1.15.2.4-xp+vc2013+x2go1 (28 Feb 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 f7fe237e5..021e60fe6 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.3-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-64-debug.1.15.2.4-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 b352ff4ef..506fdfc6a 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.3-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-64.1.15.2.4-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 e7a7bb68d..2c72b94a6 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.3-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-debug.1.15.2.4-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 b192f750e..2e6e89f57 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.3-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv.1.15.2.4-xp+vc2013+x2go1.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv