From 2ba893adb4f60930d2f897d233d53a04b53f324e Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sun, 29 Mar 2015 08:21:00 -0400 Subject: 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 --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xorg-server/installer') 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" -- cgit v1.2.3