Rebase against 2346a4012aed5a150cd971ca1e929528722a4d12.

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

@@ -1,4 +1,4 @@
-From e7592f4068371b5a8b17f25278de99d49e61e235 Mon Sep 17 00:00:00 2001
+From a238afce947c81716649156bcf9eb7fb8d345a1f 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,7 +21,7 @@ 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 cf19029..6e8d277 100644
+index 20365b9..ea44b8c 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
 @@ -76,6 +76,8 @@ SVG_SRCS = \
@@ -30,9 +30,9 @@ index cf19029..6e8d277 100644
  	resources/help.svg \
 +	resources/ietoolbar.svg \
 +	resources/ietoolbar_small.svg \
+ 	resources/image.svg \
  	resources/internet.svg \
  	resources/log_off.svg \
- 	resources/menu.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 a13349c..e366eee 100644
+index 5c11590..af197b4 100644
 --- a/dlls/shell32/shell32.rc
 +++ b/dlls/shell32/shell32.rc
-@@ -976,6 +976,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
+@@ -1076,6 +1076,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 a13349c..e366eee 100644
  IDR_AVI_SEARCHING AVI resources/searching.avi
  
 -- 
-1.9.1
+2.7.4