Rebase against 96a6053feda4e16480c21d01b3688a8d38e5ad6d

patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch

@@ -1,4 +1,4 @@
-From 0c8d61b9ee9c775d8a86900482a841d1373e8f46 Mon Sep 17 00:00:00 2001
+From b8e6db45765947ef23bbbbb080cd487170f4bbd6 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Wed, 2 Mar 2016 16:36:33 +0800
 Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6.
@@ -21,18 +21,18 @@ ietoolbar_small.svg - 256x16
  create mode 100644 dlls/shell32/resources/ietoolbar_small.svg
 
 diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
-index 8bac590..737c8c1 100644
+index 0664c85..9c15a71 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
-@@ -73,6 +73,8 @@ SVG_SRCS = \
+@@ -76,6 +76,8 @@ SVG_SRCS = \
  	resources/folder.svg \
  	resources/folder_open.svg \
  	resources/help.svg \
 +	resources/ietoolbar.svg \
 +	resources/ietoolbar_small.svg \
  	resources/internet.svg \
- 	resources/menu.svg \
- 	resources/mycomputer.svg \
+ 	resources/lock.svg \
+ 	resources/log_off.svg \
 diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp
 new file mode 100644
 index 0000000000000000000000000000000000000000..b46d056f54f6b6bc5bd390d0afbb835b824e2241
@@ -3841,10 +3841,10 @@ index 0000000..2aa52cd
 +  </g>
 +</svg>
 diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
-index 2333e39..5448db0 100644
+index d586a05..dcb8f0a 100644
 --- a/dlls/shell32/shell32.rc
 +++ b/dlls/shell32/shell32.rc
-@@ -581,6 +581,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
+@@ -698,6 +698,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
  /* @makedep: resources/idb_tb_small.bmp */
  IDB_TB_SMALL_DARK BITMAP resources/idb_tb_small.bmp
  
@@ -3860,5 +3860,5 @@ index 2333e39..5448db0 100644
  IDR_AVI_SEARCHING AVI resources/searching.avi
  
 -- 
-2.7.4
+1.9.1