From 0fc6b05dc947d92381453fbe0ce690196719da86 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 5 Jul 2014 16:42:13 +0200 Subject: Increased to version 1.15.2.0 --- xorg-server/hw/xwin/XWin.rc | 2 +- xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c | 2 ++ 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 +- 6 files changed, 7 insertions(+), 5 deletions(-) (limited to 'xorg-server') diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 3dc1372e1..8d5db742b 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -47,7 +47,7 @@ BEGIN 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.0.2 (1 May 2014)", IDC_STATIC, 36, 38, 220, 8 + LTEXT "Version 1.15.2.0 (5 July 2014)", IDC_STATIC, 36, 38, 220, 8 DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c index 6036f347f..e1f683dbe 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c @@ -12,6 +12,8 @@ #include #include +#include + typedef unsigned char BYTE; typedef int BOOL; diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index 12c9945ca..ce24a7e18 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-64-debug.1.15.0.2.installer.exe" +OutFile "vcxsrv-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 3d528692c..1b11e1677 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-64.1.15.0.2.installer.exe" +OutFile "vcxsrv-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 e8bddd162..00319b949 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-debug.1.15.0.2.installer.exe" +OutFile "vcxsrv-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 0323cf868..174916694 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv.1.15.0.2.installer.exe" +OutFile "vcxsrv.1.15.2.0.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv -- cgit v1.2.3