From 13caba89a47f48cac9ee7e754e61d7565063354a Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 28 Feb 2015 07:49:50 -0500 Subject: Increase version string to 1.15.2.4 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 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 -- cgit v1.2.3