https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41203c9bb8f39949f3b28c...
commit 41203c9bb8f39949f3b28ca61f13843b34d9874b Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Nov 10 14:09:23 2019 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Nov 10 14:09:23 2019 +0100
[OBJSEL] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/objsel/objsel_private.h | 1 - media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dll/win32/objsel/objsel_private.h b/dll/win32/objsel/objsel_private.h index 1d5bc72ad9f..37dd1d876fb 100644 --- a/dll/win32/objsel/objsel_private.h +++ b/dll/win32/objsel/objsel_private.h @@ -37,7 +37,6 @@ #include "olectl.h" #include "unknwn.h" #include "objsel.h" -#include "wine/unicode.h" #include "uuids.h"
/********************************************************************** diff --git a/media/doc/README.WINE b/media/doc/README.WINE index fa1e7c39464..16154bf0bc2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -137,7 +137,7 @@ dll/win32/nddeapi # Synced to WineStaging-3.3 dll/win32/netapi32 # Forked at Wine-1.3.34 dll/win32/npptools # Synced to WineStaging-4.18 dll/win32/ntdsapi # Synced to WineStaging-4.18 -dll/win32/objsel # Synced to WineStaging-3.3 +dll/win32/objsel # Synced to WineStaging-4.18 dll/win32/odbc32 # Synced to WineStaging-4.0. Depends on port of Linux ODBC. dll/win32/odbccp32 # Synced to WineStaging-4.0 dll/win32/ole32 # Synced to WineStaging-4.0