aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-03-29 08:21:00 -0400
committerMike DePaulo <mikedep333@gmail.com>2015-05-09 20:31:21 -0400
commit2ba893adb4f60930d2f897d233d53a04b53f324e (patch)
tree27c75518523172e6bae499bca0737efa68b174dd /xorg-server
parentc39af97542ef38620204d25d86939afe0758c05b (diff)
downloadvcxsrv-2ba893adb4f60930d2f897d233d53a04b53f324e.tar.gz
vcxsrv-2ba893adb4f60930d2f897d233d53a04b53f324e.tar.bz2
vcxsrv-2ba893adb4f60930d2f897d233d53a04b53f324e.zip
Change name to: VcXsrv (X2Go/Arctica Builds)
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.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 c63ec1be3..9311ee2b8 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -81,9 +81,9 @@ CAPTION "About "XVENDORNAMESHORT
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 "VcXsrv X Server (X2Go/Arctica Builds) ", 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 "https://github.com/ArcticaProject/vcxsrv", IDC_STATIC, 36, 28, 220, 8
LTEXT "Version "VER_PRODUCTVERSION_STR" (30 Apr 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 69c943c85..8f24bdca8 100644
--- a/xorg-server/installer/vcxsrv-64-debug.nsi
+++ b/xorg-server/installer/vcxsrv-64-debug.nsi
@@ -18,7 +18,7 @@
;--------------------------------
; The name of the installer
-Name "VcXsrv"
+Name "VcXsrv (X2Go/Arctica Builds)"
; The file to write
OutFile "vcxsrv-64-debug.1.17.0.0.installer.exe"
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi
index 9f109d6da..4dc69c810 100644
--- a/xorg-server/installer/vcxsrv-64.nsi
+++ b/xorg-server/installer/vcxsrv-64.nsi
@@ -19,7 +19,7 @@
!include "FileFunc.nsh"
; The name of the installer
-Name "VcXsrv"
+Name "VcXsrv (X2Go/Arctica Builds)"
; The file to write
OutFile "vcxsrv-64.1.17.0.0.installer.exe"
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index 58fd970ae..3e9bdfa87 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -18,7 +18,7 @@
;--------------------------------
; The name of the installer
-Name "VcXsrv"
+Name "VcXsrv (X2Go/Arctica Builds)"
; The file to write
OutFile "vcxsrv-debug.1.17.0.0.installer.exe"
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index f988b43eb..1281cfa7c 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -19,7 +19,7 @@
!include "FileFunc.nsh"
; The name of the installer
-Name "VcXsrv"
+Name "VcXsrv (X2Go/Arctica Builds)"
; The file to write
OutFile "vcxsrv.1.17.0.0.installer.exe"