aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2014-09-02 09:41:42 -0400
committerMike DePaulo <mikedep333@gmail.com>2014-09-02 09:41:42 -0400
commit5c4d7230660b86b95ae6961b9bdc2d0e792ffc19 (patch)
treef41ecafb38b797d6d5a3f0329d9722153bcb8347
parent978ec71bbf4345f477fd4f937deb3a4b481862e2 (diff)
downloadvcxsrv-5c4d7230660b86b95ae6961b9bdc2d0e792ffc19.tar.gz
vcxsrv-5c4d7230660b86b95ae6961b9bdc2d0e792ffc19.tar.bz2
vcxsrv-5c4d7230660b86b95ae6961b9bdc2d0e792ffc19.zip
Update "About VcXsrv" and update the version string to 1.15.2.0-xp+vc2013+x2gochanges1 (A simplified version of the branch name)
-rw-r--r--xorg-server/hw/xwin/XWin.rc6
-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, 7 insertions, 7 deletions
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 8d5db742b..2c703494a 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 "http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8
- LTEXT "marha@users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8
- LTEXT "Version 1.15.2.0 (5 July 2014)", IDC_STATIC, 36, 38, 220, 8
+ LTEXT "https://sourceforge.net/u/mikedep333/vcxsrv/ci/master/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+x2gochanges1 (2 Sept 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 26c41b43e..ec0807b8c 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.0.installer.exe"
+OutFile "vcxsrv-64-debug.1.15.2.0-xp+vc2013+x2gochanges1.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 d89f4af87..fe33c9298 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.0.installer.exe"
+OutFile "vcxsrv-64.1.15.2.0-xp+vc2013+x2gochanges1.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 7db6308de..2ee711ab2 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.0.installer.exe"
+OutFile "vcxsrv-debug.1.15.2.0-xp+vc2013+x2gochanges1.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 7cd2e93a9..d83d11ca7 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.0.installer.exe"
+OutFile "vcxsrv.1.15.2.0-xp+vc2013+x2gochanges1.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv