Rebase against 85cb1ff91ed4d48559c5500e2ccb0b15801edc05.

This commit is contained in:
Alistair Leslie-Hughes
2022-01-28 12:48:29 +11:00
parent b1a5648b37
commit cafb155af5
15 changed files with 96 additions and 90 deletions

View File

@@ -1,4 +1,4 @@
From ebc7c34335a94561564edb8af4dc2d606278d61f Mon Sep 17 00:00:00 2001
From c414d9b1fa846d017e9749080645b3c0b201d242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 8 May 2017 23:33:45 +0200
Subject: [PATCH] shell32: Add security property tab.
@@ -11,11 +11,11 @@ Subject: [PATCH] shell32: Add security property tab.
4 files changed, 438 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index eeb6cd63d60..7cc704e56b6 100644
index e31c165ccff..bb03300f9c9 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
EXTRADEFS = -D_SHELL32_
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHELL32_
MODULE = shell32.dll
IMPORTLIB = shell32
-IMPORTS = uuid shlwapi user32 gdi32 advapi32
@@ -516,5 +516,5 @@ index 210046e729d..0f3a64f16d2 100644
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
--
2.33.0
2.34.1