From 018765f41af15855df87b183e337f0371cfa8a17 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 3 Jun 2016 20:36:46 +0200 Subject: [PATCH] Remove an ellipsis UTF-8 character in gsignal.h Change-Id: Ic31dab513fc2ff5f2f182ae98c1b665ea4b8916b Reviewed-on: https://code.wireshark.org/review/15713 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- config.nmake | 4 ++-- tools/win-setup.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.nmake b/config.nmake index a13d5ec72d..ffd5836b5b 100644 --- a/config.nmake +++ b/config.nmake @@ -520,7 +520,7 @@ GEOIP_PKG=1.6.6 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2016-05-10 +DOWNLOAD_TAG=2016-06-03 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -562,7 +562,7 @@ XML_DLL=libxml2-2.dll !IF "$(GTK_NAME)" == "gtk2" GDK_DLL=libgdk-win32-2.0-0.dll GTK_DLL=libgtk-win32-2.0-0.dll -GTK_PKG=2.24.23-3.39 +GTK_PKG=2.24.23-3.39-1 #GTK_PKG=2.24.23-1.1 PKG_SUFIX=ws !ELSE diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 48fa6a52de..f94eebef2f 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -101,7 +101,7 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2016-05-10" +$Win64CurrentTag = "2016-06-03" $Win32CurrentTag = "2016-05-10" # Archive file / subdir. @@ -110,7 +110,7 @@ $Win64Archives = @{ "c-ares-1.11.0-win64ws.zip" = ""; "GeoIP-1.6.6-win64ws.zip" = "GeoIP-1.6.6-win64ws"; "gnutls-3.2.15-2.9-win64ws.zip" = ""; - "gtk+-bundle_2.24.23-3.39_win64ws.zip" = "gtk2"; + "gtk+-bundle_2.24.23-3.39-1_win64ws.zip" = "gtk2"; "kfw-3-2-2-x64-ws.zip" = ""; "libsmi-svn-40773-win64ws.zip" = ""; "libssh-0.7.2-win64ws.zip" = "";