This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.15.2.2-xp+vc2013+x2go1 in repository vcxsrv. commit 8a8f50cdcfaf2c0f3c7a86e9156e92055a5e453a Author: Mike DePaulo <mikedep333@gmail.com> Date: Sun Apr 6 08:19:14 2014 -0400 Update NSIS scripts to specify that we are "XP Compatible" Conflicts: 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 | 4 ++-- xorg-server/installer/vcxsrv-64.nsi | 4 ++-- xorg-server/installer/vcxsrv-debug.nsi | 4 ++-- xorg-server/installer/vcxsrv.nsi | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index ce24a7e..26c41b4 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -18,10 +18,10 @@ ;-------------------------------- ; The name of the installer -Name "VcXsrv" +Name "VcXsrv - XP Compatible" ; The file to write -OutFile "vcxsrv-64-debug.1.15.2.0.installer.exe" +OutFile "vcxsrv-xp-64-debug.1.15.2.0.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 1b11e16..d89f4af 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -18,10 +18,10 @@ ;-------------------------------- ; The name of the installer -Name "VcXsrv" +Name "VcXsrv - XP Compatible" ; The file to write -OutFile "vcxsrv-64.1.15.2.0.installer.exe" +OutFile "vcxsrv-xp-64.1.15.2.0.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 00319b9..7db6308 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -18,10 +18,10 @@ ;-------------------------------- ; The name of the installer -Name "VcXsrv" +Name "VcXsrv - XP Compatible" ; The file to write -OutFile "vcxsrv-debug.1.15.2.0.installer.exe" +OutFile "vcxsrv-xp-debug.1.15.2.0.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 1749166..7cd2e93 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -18,10 +18,10 @@ ;-------------------------------- ; The name of the installer -Name "VcXsrv" +Name "VcXsrv - XP Compatible" ; The file to write -OutFile "vcxsrv.1.15.2.0.installer.exe" +OutFile "vcxsrv-xp.1.15.2.0.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git