Rebase against de66ea9df6746917cada71d2c27b5cc38cbdd2f0.

This commit is contained in:
Alistair Leslie-Hughes
2023-10-17 10:12:05 +11:00
parent 3dcd383186
commit 7d2672183d
6 changed files with 60 additions and 59 deletions

View File

@@ -1,4 +1,4 @@
From 4c2973947ad85bbed99b3149462eb73e823c977a Mon Sep 17 00:00:00 2001
From b652c99cce554343ab9a25b9b0c043a7ffdf53f6 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,7 +11,7 @@ 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 ad2f8cc0e45..8efcbfb4dbf 100644
index 743df597ee4..9342384b6ba 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
@@ -22,7 +22,7 @@ index ad2f8cc0e45..8efcbfb4dbf 100644
+IMPORTS = uuid shlwapi user32 gdi32 advapi32 aclui
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 comdlg32 gdiplus
C_SRCS = \
SOURCES = \
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 264947d337d..90898b7ed98 100644
--- a/dlls/shell32/shell32.rc
@@ -515,5 +515,5 @@ index 210046e729d..0f3a64f16d2 100644
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
--
2.40.1
2.42.0