From 1a3e41e7692f050b90a4d6b9b257e2509cde78ea Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 10 Nov 2019 14:08:38 +0100 Subject: [PATCH] [NPPTOOLS] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/npptools/main.c | 1 - media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/npptools/main.c b/dll/win32/npptools/main.c index a72f634e02b..ad2b8931556 100644 --- a/dll/win32/npptools/main.c +++ b/dll/win32/npptools/main.c @@ -16,7 +16,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c4baef83eb3..a793e1d3dec 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -135,7 +135,7 @@ dll/win32/msxml4 # Synced to WineStaging-3.3 dll/win32/msxml6 # Synced to WineStaging-3.3 dll/win32/nddeapi # Synced to WineStaging-3.3 dll/win32/netapi32 # Forked at Wine-1.3.34 -dll/win32/npptools # Synced to WineStaging-3.3 +dll/win32/npptools # Synced to WineStaging-4.18 dll/win32/ntdsapi # Synced to WineStaging-3.9 dll/win32/objsel # Synced to WineStaging-3.3 dll/win32/odbc32 # Synced to WineStaging-4.0. Depends on port of Linux ODBC.