Added some icons for merge tool.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 17 Jan 2013 18:06:23 +0100
changeset 4496 2596bbef22f9
parent 4495 512fb0a0d8bd
child 4497 bd0b3a526f28
Added some icons for merge tool.
GenericToolbarIconLibrary.st
--- a/GenericToolbarIconLibrary.st	Thu Jan 17 17:24:20 2013 +0100
+++ b/GenericToolbarIconLibrary.st	Thu Jan 17 18:06:23 2013 +0100
@@ -8347,6 +8347,644 @@
     ^ self upRight22x22Icon
 ! !
 
+!GenericToolbarIconLibrary class methodsFor:'image specs-tools-ChangeSetDiffTool & TextDiffTool'!
+
+mergeMerge24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeMerge24x24.xpm"
+
+    "
+     self mergeMerge24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeMerge24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeMerge24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+RD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HE0-HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HJ$T&RD!!HRD!!HRD!!HRD!!H
+RD!!HRD!!HRD!!HK$YFPA=HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HK$]FQ4\<E$!!HRD!!HRD!!HRD!!HRD!!HRD!!HNT]GQ4]GQ2 HRD!!HRD!!HRD!!HRD!!HRD!!HN$]GQ4]GQ4]D
+I$!!HRD!!HRD!!HRD!!HRD!!HN4]GQ4]GQ4]GO %HRD!!HRD!!H@D!!HRD!!HK$]GQ4]GQ4L]RD!!HRD!!HR@T1ED!!HRD!!HK$]GQ4]GI0MHRD!!HRD AH$EBFD!!HRD!!HK$]G
+Q34JRD!!HRD!!HRAD4P$IBF4!!HRD!!HJ4]@ET!!HRD!!HRD PL4IBP$IBHD!!HRD!!HJQ9HRD!!HRD!!HCCEBP$IBP$IBF4!!HRD!!H@$!!HRD!!HRD [M$IBP$IBP$IBF4!!H
+RD!!HRD!!HRD!!HRD DH4EBP$IBP$IBHD!!HRD!!HRD!!HRD!!HRD!!HR@<2P$IBP$IBF4!!HRD!!HRD!!HRD!!HRD!!HRD!!HD#UBP$IBF4!!HRD!!HRD!!HRD!!HRD!!HRD!!HR@T!!
+PTIBF4!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HA2QBFD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD MC$!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!H
+RD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!H') ; colorMapFromArray:#[46 37 13 60 47 16 38 49 22 47 60 27 75 59 19 72 57 20 72 58 20 79 63 22 56 72 33 57 73 33 62 79 35 63 81 36 84 66 23 84 68 23 85 68 23 91 73 24 98 78 27 107 86 30 110 89 30 115 92 31 115 93 31 66 85 38 69 86 39 72 93 42 115 93 32 117 94 32 117 95 32 118 94 32 118 95 32 79 101 46 84 107 49 84 109 48 117 96 32 140 112 38 147 118 41 148 119 40 154 124 43 100 128 57 101 129 58 103 132 60 116 149 67 117 150 67 123 158 71 124 158 71 125 160 72 124 160 73 127 162 72 126 162 73 170 137 47 171 138 47 189 152 52 200 161 54 217 174 58 220 177 60 226 181 62 231 186 63 232 187 63 128 163 74 128 164 73 130 165 74 133 170 77 138 176 79 147 189 85 149 191 86 150 190 86 233 187 64 234 188 64 157 201 91 161 206 93 162 207 93 164 210 95 165 211 95 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@F@@@G@@@G0@@G<@@G?@@G? @G?0DG?@\G>A<G8C<G O<F@?<DA?<@A?<@@_<@@G<@@C<@@@<@@@L@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeMerge32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeMerge32x32.xpm"
+
+    "
+     self mergeMerge32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeMerge32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeMerge32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&HAX&I"X&I"X&I"X&I"X&I"X&I"X&I"
+X&I"X&I"X&I"X#P*@&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"OFEWE&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&H>XVE!!PQQ"X&I"X&I"X&I"
+X&I"X&I"X&I"X&I"X&I"X#9!!XVE!!WSHNX&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"P&E!!XVE!!XU01CFI"X&I"X&I"X&I"X&I"X&I"X&I"X&IBXVE!!XVE!!XVEY
+GVI"X&I"X&I"X&I"X&I"X&I"X&I"X$U!!XVE!!XVE!!XVE!!PQQ"X&I"X&I"X&I"X&I"X&I"X&I"Q6E!!XVE!!XVE!!XVE!!WSDLX&I"X&I"X&I"X&I"X&I"X&IGXVE!!
+XVE!!XVE!!XVE[G&I"X&I"X&I"X&H@X&I"X&I"X$U!!XVE!!XVE!!XVE_LP1"X&I"X&I"X&HYRRM"X&I"X&I"P&E!!XVE!!XVE!!P ="X&I"X&I"X&HIN5YZH6I"X&I"
+X&IBXVE!!XVE!!VAY"X&I"X&I"X&HDKEIZV%(+X&I"X&I"X$E!!XVE!!W28CX&I"X&I"X&I"F45ZV%)ZV"1"X&I"X&I"OVE!!XSLLX&I"X&I"X&I"FT!!ZV%)ZV%)Z
+JVI"X&I"X&H=XTHTX&I"X&I"X&I"AC%TV%)ZV%)ZV%(5X&I"X&I"X#L\X&I"X&I"X&I"X"IPV%)ZV%)ZV%)ZV#]"X&I"X&I"@VI"X&I"X&I"X UJV%)ZV%)Z
+V%)ZV%)ZM6I"X&I"X&I"X&I"X&I"X&I"X!!)MU%)ZV%)ZV%)ZV%(7X&I"X&I"X&I"X&I"X&I"X&I"X&H TE)ZV%)ZV%)ZV#]"X&I"X&I"X&I"X&I"X&I"X&I"
+X&HGN%QZV%)ZV%)ZKFI"X&I"X&I"X&I"X&I"X&I"X&I"X&I"FT-ZV%)ZV%()X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X!!=NV%)ZV"Y"X&I"X&I"X&I"X&I"
+X&I"X&I"X&I"X&I"X X!!TU)VIVI"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&HIM5P#X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"DAE"X&I"X&I"
+X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"
+X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X&I"X @a') ; colorMapFromArray:#[29 23 8 22 28 13 26 34 14 29 35 17 43 35 11 41 33 12 49 40 13 55 43 15 56 45 15 56 46 15 32 41 18 33 40 19 32 42 18 33 42 19 36 45 21 37 47 21 57 46 16 59 47 16 38 48 21 38 49 22 39 49 23 45 58 25 46 58 27 63 51 18 64 53 18 65 53 18 72 57 20 75 60 20 52 67 30 57 72 33 62 81 35 88 71 24 91 73 25 99 80 27 105 85 29 110 88 29 111 88 30 112 90 30 113 92 31 116 92 31 116 93 31 117 93 31 68 87 40 113 91 32 115 93 32 117 95 32 75 96 43 76 97 44 77 97 44 77 98 45 78 100 44 88 112 51 93 121 55 120 96 32 121 96 32 121 98 33 122 99 33 126 101 35 128 102 34 144 115 39 109 139 62 109 140 63 110 141 64 111 142 64 111 143 64 113 144 64 112 144 65 114 145 65 114 146 66 116 148 66 116 148 67 116 150 68 170 136 46 171 137 46 175 140 47 184 148 50 191 153 52 194 156 53 208 167 57 216 173 59 217 174 59 219 176 60 223 179 61 228 184 62 229 184 63 231 186 63 232 187 63 133 170 76 138 177 80 139 178 80 234 188 64 153 195 88 155 198 89 157 201 91 158 202 91 160 205 92 163 209 94 165 211 95 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@H@@@@C @@@@<@@@@O0@@@C?@@@@?<@@@O? @@C?>@@@??8@@O?<@HC?>@N@?>@O O>@O8C?@G>@?@G? O@G?8C@C?>@ C?? @@_?8@@A?>@@@
+O? @@@?8@@@C>@@@@_ @@@A8@@@@F@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeNext24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeNext24x24.xpm"
+
+    "
+     self mergeNext24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeNext24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeNext24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+DQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQ
+DQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQA \GA0\GA0\GA0\FDQDQDQDQDQDQDQDQBQ@PDA@P
+DA@PDA@IDQDQDQDQDQDQDQDQDP8PDA@PDA@PD@8QDQDQDQDQDQDQDQDQDPTPDA@PDA@PD@TQDQDQDQDQDQDQDQDQDQDKDA@PDA@PB1DQDQDQDQDQDQDQDQDQ
+DQDBDA@PDA@P@!!DQDQDQDQDQDQDQDQDQDQDQB!!@PDA@JDQDQDQDQDQDQDQDQDQDQDQDQ@P<PD@<ADQDQDQDQDQDQDQDQDQDQDQDQDP PD@ QDQDQDQDQDQDQ
+DQDQDQDQDQDQDQDLCADQDQDQDQDQDQDQDQDQDQDQDQDQDQDC@1DQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQ
+DQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQ
+DQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQ') ; colorMapFromArray:#[0 41 72 0 43 72 0 52 88 0 60 101 0 63 108 0 63 109 0 67 115 0 71 120 0 75 129 0 76 129 0 98 167 0 112 190 0 121 207 0 124 214 0 125 214 0 132 226 0 136 232 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@@@@@@??@@??@@_>@@_>@@O<@@O<@@G8@@G8@@C0@@A @@A @@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeNext32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeNext32x32.xpm"
+
+    "
+     self mergeNext32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeNext32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeNext32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8@@0LC@0LC
+@0LC@0LC@0LC@0@^G!!8^G!!8^G!!8^G!!8^G!!8RGQ4]GQ4]GQ4]GQ4]GQ4RG!!8^G!!8^G!!8^G!!8^G!!8^G T\GQ4]GQ4]GQ4]GQ4]G@T^G!!8^G!!8^G!!8^G!!8^G!!8^
+G!!@]GQ4]GQ4]GQ4]GQ4OG!!8^G!!8^G!!8^G!!8^G!!8^G!!8^@Q(]GQ4]GQ4]GQ4]F H^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^B14]GQ4]GQ4]GQ4LG!!8^G!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^E14]GQ4]GQ4]E18^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8HGQ4]GQ4]GQ4HG!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8TGQ4]GQ4]D!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G T\GQ4]GQ0EG!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G <\GQ4]C18^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^@Q(]GQ AG!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^B!!4]B!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^E!!X^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8G
+A18^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^
+G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G!!8^G @a') ; colorMapFromArray:#[0 20 32 0 27 47 0 27 48 0 30 52 0 33 56 0 33 57 0 34 57 0 38 65 0 41 69 0 51 87 0 52 87 0 54 91 0 53 92 0 68 115 0 68 116 0 70 119 0 71 121 0 89 152 0 90 153 0 94 160 0 94 161 0 102 174 0 103 174 0 111 189 0 119 205 0 121 208 0 123 210 0 132 225 0 132 226 0 136 232 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A??>@@O??@@C??0@@_?8@@G?>@@@??@@@G? @@A?8@@@O<@@@C?@@@@_ @@@G8@@@@<@@@@F@@@@A
+ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeNextConflict24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeNextConflict24x24.xpm"
+
+    "
+     self mergeNextConflict24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeNextConflict24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeNextConflict24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,DADQDQDQDQDQDQ@P
+KB0,KB0,KB0,KB0,I",+J2,+J2,+J2,UKB0,KB0,KB0,KB0,@B(+J2,+J2,+J2$,KB0,KB0,KB0,KB0,KAP+J2,+J2,+J1H,KB0,KB0,KB0,KB0,KB0(J2,+
+J2,+I20,KB0,KB0,KB0,KB0,KB0PJ2,+J2,+C"0,KB0,KB0,KB0,KB0,B!!\KCQLSD1LLBQ\VKB0,KB0,KB0,KB0,FBT%IRT%IRT%IRTYKB0,KB0,KB0,KB0,
+KBD%IRT%IRT%IRH,KB0,KB0,KB0,KB0,K@X%IRT%IRT%IP(,KB0,KB0,KB0,KB0,KB0^IRT%IRT%G"0,KB0,KB0,KB0,KB0,KB0CIRT%IRT%AB0,KB0,KB0,
+KB0,KB0,KB0,F2T%IRT\KB0,KB0,KB0,KB0,KB0,KB0,@RL%IRPBKB0,KB0,KB0,KB0,KB0,KB0,KA$%IQ(,KB0,KB0,KB0,KB0,KB0,KB0,KB0!!HR0,KB0,
+KB0,KB0,KB0,KB0,KB0,KB0EA"0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,
+KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,KB0,') ; colorMapFromArray:#[0 37 62 87 14 0 92 14 0 104 16 0 108 17 0 118 18 0 120 18 0 123 19 0 125 19 0 121 20 3 125 20 0 120 20 4 94 42 48 93 44 50 0 51 87 0 52 89 0 54 91 0 56 96 0 62 107 91 56 72 0 65 111 0 74 127 128 20 0 132 20 0 143 22 0 146 23 0 149 24 0 184 29 0 189 29 0 208 33 0 210 33 0 228 36 0 230 36 0 231 36 0 236 37 0 247 39 0 250 39 0 255 40 0 0 79 136 0 111 189 0 114 195 0 123 210 0 125 215 0 136 232 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@??@@??@@?>@@_>@@O<@@O<@@??@@??@@_>@@_>@@O<@@O<@@G8@@G8@@C0@@A @@A @@@@@@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeNextConflict32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeNextConflict32x32.xpm"
+
+    "
+     self mergeNextConflict32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeNextConflict32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeNextConflict32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPQ4]GQ4]GQ4]GQ4]GQ4]GQ5APTEAPTEAPTEAPTEAPTEANTA@PDA@PDA@PDA@
+PDA@NDEAPTEAPTEAPTEAPTEAPTDQO4A@PDA@PDA@PDA@PC8OPTEAPTEAPTEAPTEAPTEAPTD7PDA@PDA@PDA@PDA@H4EAPTEAPTEAPTEAPTEAPTEAPP<=PDA@
+PDA@PDA@PC0NPTEAPTEAPTEAPTEAPTEAPTEAPRI@PDA@PDA@PDA@HTEAPTEAPTEAPTEAPTEAPTEAPTEACS-@PDA@PDA@PC-APTEAPTEAPTEAPTEAPTEAPTEA
+PTEAG4A@PDA@PDA@G$EAPTEAPTEAPTEAPTEAPTEAPTDHB@ GD2@ HB@ HAHGB@ H@DEAPTEAPTEAPTEAPTEAPR\6M#X6M#X6M#X6M#X6M"%APTEAPTEAPTEA
+PTEAPTEACCP6M#X6M#X6M#X6M#X5CDEAPTEAPTEAPTEAPTEAPTEAICX6M#X6M#X6M#X6M"YAPTEAPTEAPTEAPTEAPTEAPTDDLCX6M#X6M#X6M#X2ADEAPTEA
+PTEAPTEAPTEAPTEAPTDZM#X6M#X6M#X6M!!-APTEAPTEAPTEAPTEAPTEAPTEAPTD-M#X6M#X6M#X.@TEAPTEAPTEAPTEAPTEAPTEAPTEAPQX6M#X6M#X6M!!]A
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPR 6M#X6M#X*PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEABCP6M#X6M@1APTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAGCX6
+M#X$PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTDAK3X6L@QAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTDXM#XYPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPTD+KDEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPQPUPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPP@a') ; colorMapFromArray:#[35 6 0 45 6 0 47 7 0 50 8 0 52 8 0 53 8 0 50 10 5 50 11 6 58 9 0 58 10 0 61 9 0 62 9 0 62 10 0 0 26 47 0 29 50 0 32 53 0 33 55 0 35 60 41 36 50 40 37 53 65 11 0 69 10 0 73 11 0 78 12 0 88 13 0 94 14 0 98 15 0 104 16 0 124 19 0 0 37 64 0 45 77 0 48 82 40 49 72 0 58 99 0 61 104 0 73 124 128 20 0 130 20 0 135 21 0 164 26 0 171 28 0 174 28 0 180 28 0 189 29 0 198 31 0 202 32 0 209 33 0 224 35 0 229 36 0 230 36 0 235 37 0 245 38 0 247 39 0 248 39 0 255 40 0 0 78 133 0 92 156 0 96 165 0 112 191 0 116 198 0 125 214 0 128 218 0 132 226 0 134 228 0 136 232 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@C??0@@??<@@O??@@A?? @@_?8@@C?<@@@?>@@@G? @@O?? @C??0@@??<@@G?>@@A?? @@O?0@@A?<@@@_>@@@C?@@@@?0@@@G
+8@@@A>@@@@O@@@@A @@@@X@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeNextConflictAutoAdvance24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeNextConflictAutoAdvance24x24.xpm"
+
+    "
+     self mergeNextConflictAutoAdvance24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeNextConflictAutoAdvance24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeNextConflictAutoAdvance24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@LS(:N#(:N#(:N#(1PDA@PDA@PDA@PDA@D3<?O3<?O3<?O38QPDA@PDA@PDA@PDA@PCD?O3<?O3<?O2=@
+PDA@PDA@PDA@PDA@P@8;O3<?O3<?N09@PDA@PDA@PDA@PDA@PD@WN#(:N#(:E$A@PDA@PDA@PDA@PDA@KCP4MSX6M#X5MCP*PDA@PDA@PDA@PDA@ES<?O#<?
+O3<?O#<TPDA@PDA@PDA@PDA@PC\?O3<?O3<?O3Q@PDA@PDA@PDA@PDA@PAD>O3<?O3<?N1A@PDA@PDA@PDA@PDA@PD@-O#<?O38?KDA@PDA@PDA@PDA@PDA@
+PD@ANS(:N#(9@DA@PDA@PDA@PDA@PDA@F"H"HR@ HB@!!H"H[PDA@PDA@PDA@PDA@BR$)JR$)JR$)JR$KPDA@PDA@PDA@PDA@PA8)JR$)JR$)JQ=@PDA@PDA@
+PDA@PDA@P@\(JR$)JR$)J@]@PDA@PDA@PDA@PDA@PD@XJR$)JR$)FTA@PDA@PDA@PDA@PDA@PD@BIR$)JR$%ADA@PDA@PDA@PDA@PDA@PDA@CB$)JR$MPDA@
+PDA@PDA@PDA@PDA@PDA@PBL)JRQ@PDA@PDA@PDA@PDA@PDA@PDA@P@$)JP)@PDA@PDA@PDA@PDA@PDA@PDA@PD@\GTA@PDA@PDA@PDA@PDA@PDA@PDA@PD@C
+ATA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@') ; colorMapFromArray:#[0 31 55 0 33 57 69 11 0 71 12 0 73 11 0 78 12 0 82 12 0 82 13 0 95 14 0 95 15 0 96 15 0 105 16 0 119 19 0 126 20 0 0 44 74 0 44 75 0 45 78 0 47 81 0 47 82 0 49 85 0 56 95 0 61 103 0 65 110 0 66 112 147 24 0 153 24 0 158 25 0 163 26 0 169 27 0 174 27 0 178 27 0 182 28 0 190 37 12 192 33 5 201 32 0 207 33 0 213 33 0 240 38 0 243 38 0 250 39 0 251 39 0 255 40 0 0 78 133 0 81 138 0 81 139 0 85 144 0 90 155 0 92 155 0 91 156 0 91 157 0 97 165 0 97 166 0 98 167 0 99 169 0 100 170 0 101 172 0 111 189 0 113 192 0 118 201 0 132 226 0 133 227 0 134 229 0 135 231 0 136 232 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@??@@??@@_>@@_>@@O<@@??@@??@@_>@@_>@@O<@@O<@@??@@??@@_>@@_>@@O<@@O<@@G8@@C0@@C0@@A @@A @@@@@') ; yourself); yourself]
+!
+
+mergeNextConflictAutoAdvance32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeNextConflictAutoAdvance32x32.xpm"
+
+    "
+     self mergeNextConflictAutoAdvance32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeNextConflictAutoAdvance32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeNextConflictAutoAdvance32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+V%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)Z@RT)JR$)JR$)JR$)JR$)JRTAV%)ZV%)ZV%)ZV%)ZV%)ZI5!!YVU%YVU%YVU%YVU%YJE)Z
+V%)ZV%)ZV%)ZV%)ZV%(OUE%YVU%YVU%YVU%YVUHOV%)ZV%)ZV%)ZV%)ZV%)ZV%(#VU%YVU%YVU%YVU%YH5)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)NVU%YVU%YVU%Y
+VT5ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV!!MXVU%YVU%YVU%XD5)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV"5TUEQTUEQTUB1ZV%)ZV%)ZV%)ZV%)ZV%)ZV%(LQT!!HQ$-K
+R4-KR4-KQ$!!HK@1ZV%)ZV%)ZV%)ZV%)ZV%(%VU%YVU%YVU%YVU%YVU$$V%)ZV%)ZV%)ZV%)ZV%)ZV%)PVU%YVU%YVU%YVU%YS5)ZV%)ZV%)ZV%)ZV%)ZV%)Z
+V"EYVU%YVU%YVU%YVU$SV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV$-YVU%YVU%YVU%YRE)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZDUYYVU%YVU%YVUTQV%)ZV%)ZV%)ZV%)Z
+V%)ZV%)ZV%)ZJ5%YVU%YVU%YJ%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%(NSUAPTEAPTD0LV%)ZV%)ZV%)ZV%)ZV%)ZV%)Z@"86M#X5MCP4MCP4MSX6M#@CV%)Z
+V%)ZV%)ZV%)ZV%)ZF$MCP4MCP4MDQDQDP4MCGE)ZV%)ZV%)ZV%)ZV%)ZV%)ZNTMCP4MCP4QDQDQCP3)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%(XP4MCP4MCQDQDQDMC
+FE)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%(2P4MCP4MDQDQDQCMZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV $?P4MCP4QDQDQ@BU)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV!!=CP4MC
+QDQDQBAZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZAC-CP4MDQDP<A%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZFTMCP4MCP11ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)Z
+V%)ZM4MCP4L9V%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%(UP$MCP1!!ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%(0P4L1V%)ZV%)ZV%)ZV%)ZV%)ZV%)Z
+V%)ZV%)ZV%)ZV X=O %ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV!!4^V%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV QZV%)ZV%)ZV%)ZV%)Z
+V%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV%)ZV @a') ; colorMapFromArray:#[0 17 27 0 17 29 41 7 0 42 6 0 51 8 0 51 9 0 53 8 0 54 10 0 57 9 0 59 9 0 59 10 0 0 20 33 0 20 34 0 20 35 0 21 36 0 23 41 0 32 53 0 32 55 0 36 61 0 36 62 0 37 63 67 11 0 68 10 0 70 10 0 71 11 0 86 13 0 89 15 0 93 14 0 94 14 0 106 16 0 111 18 0 114 18 0 123 19 0 0 40 68 0 45 78 0 46 78 0 52 87 0 54 93 0 55 94 0 59 99 0 58 100 0 62 106 0 65 111 0 70 120 0 72 122 0 72 123 134 21 0 139 22 0 140 22 0 148 23 0 151 24 0 158 25 0 159 31 10 160 27 3 166 26 0 182 29 0 189 30 0 191 30 0 193 30 0 226 35 0 230 36 0 235 37 0 239 37 0 241 38 0 244 38 0 250 39 0 252 40 0 254 40 0 255 40 0 0 75 128 0 83 141 0 85 145 0 87 147 0 90 154 0 91 154 0 91 155 0 98 167 0 101 172 0 102 175 0 104 177 0 109 185 0 109 186 0 116 198 0 116 199 0 118 201 0 130 222 0 132 226 0 135 230 0 135 231 0 136 232 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@G??8@@??<@@O??@@A?? @@O?0@@C?<@@@_>@@A??>@@O??@@A?? @@_?8@@C?<@@@??@@@G? @@A?8@@G??8@@??<@@G?>@@A?? @@O?0@@C?<@@@_
+>@@@G? @@@?0@@@G8@@@A>@@@@O@@@@C0@@@@X@@@@B@@@@@@@@b') ; yourself); yourself]
+!
+
+mergePrev24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergePrev24x24.xpm"
+
+    "
+     self mergePrev24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergePrev24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergePrev24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+EQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTU
+EQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTH
+BATUEQTUEQTUEQTUEQTUEQTUEQTUEQTPDATUEQTUEQTUEQTUEQTUEQTUEQTUEP4TE@4UEQTUEQTUEQTUEQTUEQTUEQTU@!!LTEALCEQTUEQTUEQTUEQTUEQTU
+EQTUC!!PTEAPNEQTUEQTUEQTUEQTUEQTUEQTFEAPTEAPTAQTUEQTUEQTUEQTUEQTUEQTOEAPTEAPTC1TUEQTUEQTUEQTUEQTUEP(TEAPTEAPTE@(UEQTUEQTU
+EQTUEQTU@QHTEAPTEAPTEADAEQTUEQTUEQTUEQTUB1PTEAPTEAPTEAPKEQTUEQTUEQTUEQTUAP\GA0\GA0\GA0\EEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTU
+EQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTU
+EQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTUEQTU') ; colorMapFromArray:#[0 38 64 0 38 65 0 46 78 0 46 80 0 54 91 0 55 91 0 54 92 0 56 96 0 61 104 0 65 110 0 66 111 0 78 134 0 79 134 0 80 136 0 98 167 0 117 201 0 126 216 0 128 218 0 129 220 0 134 229 0 136 232 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A @@A @@C0@@G8@@G8@@O<@@O<@@_>@@??@@??@@??@@@@@@@@@@@@@@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergePrev32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergePrev32x32.xpm"
+
+    "
+     self mergePrev32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergePrev32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergePrev32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!B (!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRDYFRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!C"@ CRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HPP\HB@[@2D!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!D"@ HB@RHRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HP ^HB@ HA8FHRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!E"@ HB@ HAT!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HP, HB@ HB@ H@,!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD@F"@ HB@ HB@ F @!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HP< HB@ HB@ HB@ C2D!!HRD!!HRD!!HRD!!HRD!!HRD!!HRDCGR@ HB@ HB@ HB@\
+@2D!!HRD!!HRD!!HRD!!HRD!!HRD!!HQP HB@ HB@ HB@ HB@THRD!!HRD!!HRD!!HRD!!HRD!!HRDHG"@ HB@ HB@ HB@ HA8HHRD!!HRD!!HRD!!HRD!!HRD!!HQ  HB@ HB@ 
+HB@ HB@ HA\!!HRD!!HRD!!HRD!!HRD!!HRD!!BP$IBP$IBP$HBP$IBP$IBRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!
+HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HRD!!HP@a') ; colorMapFromArray:#[0 26 45 0 30 52 0 30 53 0 30 54 0 32 54 0 34 58 0 35 58 0 34 59 0 35 60 0 37 64 0 39 69 0 43 72 0 43 73 0 53 90 0 54 92 0 57 96 0 57 97 0 73 124 0 73 125 0 75 129 0 76 130 0 94 160 0 94 161 0 95 162 0 99 168 0 109 187 0 117 200 0 125 213 0 126 216 0 127 217 0 134 228 0 134 229 0 136 232 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@F@@@@A @@@@<@@@@_ @@@G8@@@C?@@@@?0@@@_>@@@O?0@@C?<@@A?? @@_?8@@O??@@C?
+?0@@??<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergePrevConflict24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergePrevConflict24x24.xpm"
+
+    "
+     self mergePrevConflict24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergePrevConflict24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergePrevConflict24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0
+LC@0LC@0LC@0LC@0LC@0LC@MB#@0LC@0LC@0LC@0LC@0LC@0LC@0LC@$H3@0LC@0LC@0LC@0LC@0LC@0LC@0LA8(JA00LC@0LC@0LC@0LC@0LC@0LC@0@2 (
+JBXBLC@0LC@0LC@0LC@0LC@0LC@0HB (JB _LC@0LC@0LC@0LC@0LC@0LC@GJB (JB (AC@0LC@0LC@0LC@0LC@0LC@"JB (JB (HS@0LC@0LC@0LC@0LC@0
+LA((JB (JB (J@40LC@0LC@0LC@0LC@0@BT(JB (JB (JBPALC@0LC@0LC@0LC@0GB (JB (JB (JB [LC@0LC@0LC@0LC@0B 4EC!!\WE1\OAP0JLC@0LC@0
+LC@0LC@0LC@SK2</K2</ES@0LC@0LC@0LC@0LC@0LC@,K2</K2</KC@0LC@0LC@0LC@0LC@0LA /K2</K2</K1$0LC@0LC@0LC@0LC@0DB4/K2</K2</K28Q
+LC@0LC@0LC@0LC@0JR</K2</K2</K2<*LC@0LC@0LC@0LC@0D1PVE!!XVE!!XVE!!XSLC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0
+LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0LC@0') ; colorMapFromArray:#[74 11 0 75 12 0 96 15 0 100 15 0 108 17 0 109 21 4 110 20 4 112 18 0 117 18 0 118 18 0 119 18 0 124 19 0 123 20 0 126 20 0 82 44 55 81 46 57 0 38 66 0 41 70 0 52 89 0 53 91 0 54 91 0 55 96 0 56 96 79 61 83 0 65 111 0 66 112 128 20 0 147 23 0 152 24 0 153 24 0 157 24 0 184 29 0 190 30 0 219 35 0 222 35 0 234 37 0 238 37 0 242 38 0 251 39 0 253 40 0 255 40 0 0 79 133 0 83 141 0 117 199 0 118 202 0 127 217 0 129 220 0 136 232 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@A @@A @@C0@@G8@@G8@@O<@@O<@@_>@@??@@??@@??@@O<@@O<@@_>@@??@@??@@??@@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergePrevConflict32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergePrevConflict32x32.xpm"
+
+    "
+     self mergePrevConflict32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergePrevConflict32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergePrevConflict32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPQ\VPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAKB-APTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPQ,5MQ)APTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTDH
+LCT5K0MAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPRT5MST5H4EAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTDUMST5MST2BTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPR$5MST5MST''PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTDYMST5MST5MSTXPTEAPTEAPTEAPTEAPTEAPTEAPTEA@R85MST5MST5MR4BPTEAPTEAPTEAPTEA
+PTEAPTEAPTD]MST5MST5MST5MQ1APTEAPTEAPTEAPTEAPTEAPTEABCD5MST5MST5MST5L@!!APTEAPTEAPTEAPTEAPTEAPTD&MST5MST5MST5MST5IDEAPTEA
+PTEAPTEAPTEAPTEAESH5MST5MST5MST5MST2BTEAPTEAPTEAPTEAPTEAPTD*MST5MST5MST5MST5MST(PTEAPTEAPTEAPTEAPTEA@@ HB@TQHB@ HB@ D TH
+B@!!APTEAPTEAPTEAPTEAPTEAPTEAG$A@PDA@PDA@G4EAPTEAPTEAPTEAPTEAPTEAPTEAPP(:PDA@PDA@PD@;CDEAPTEAPTEAPTEAPTEAPTEAPTEAHTA@PDA@
+PDA@PD@"PTEAPTEAPTEAPTEAPTEAPTEAPP0<PDA@PDA@PDA@PC4NPTEAPTEAPTEAPTEAPTEAPTEAM$A@PDA@PDA@PDA@PC]APTEAPTEAPTEAPTEAPTEAPQ@?
+PDA@PDA@PDA@PDA@O1AAPTEAPTEAPTEAPTEAPTEANDA@PDA@PDA@PDA@PDA@NTEAPTEAPTEAPTEAPTEAPTDKB0,KB0,KB0,KB0,KB00LPTEAPTEAPTEAPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEA
+PTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPTEAPP@a') ; colorMapFromArray:#[36 6 0 52 7 0 50 8 0 54 8 0 50 10 5 50 11 6 56 9 0 58 9 0 59 9 0 62 9 0 0 30 50 0 31 54 0 32 53 0 32 55 0 34 57 0 36 61 0 36 62 41 36 50 40 36 53 64 11 0 66 10 0 67 11 0 69 10 0 74 11 0 76 12 0 83 13 0 92 14 0 100 15 0 102 16 0 112 18 0 0 46 81 0 49 85 40 49 72 0 60 102 0 65 110 131 20 0 135 21 0 140 22 0 145 23 0 170 27 0 174 27 0 182 28 0 187 29 0 202 31 0 211 33 0 214 33 0 221 35 0 232 36 0 238 37 0 242 38 0 249 39 0 250 39 0 252 40 0 255 40 0 0 78 133 0 82 141 0 100 171 0 104 178 0 118 201 0 120 207 0 129 220 0 131 224 0 135 230 0 135 231 0 136 232 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@X@@@@F@@@@C0@@@A>@@@@_ @@@O<@@@C?@@@A?8@@@??@@@O?0@@G?>@@A?? @@??<@@O??@@G??0@@G? @@C?<@@@?
+?@@@_?8@@G?>@@C??0@@??<@@O??@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeUsingA24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingA24x24.xpm"
+
+    "
+     self mergeUsingA24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingA24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingA24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@DA@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@@A@PDA
+@PDA@PDA@PDA@PDA@PDA@@@@@@@@@PDA@PDA@PDA@PDA@PDA@PDA@@@A@@@@@PDA@PDA@PDA@PDA@PDA@PD@@@@A@P@@@PDA@PDA@PDA@PDA@PDA@PD@@@@A
+@P@@@@DA@PDA@PDA@PDA@PDA@PD@@@DA@PD@@@DA@PDA@PDA@PDA@PDA@P@@@@DA@PD@@@DA@PDA@PDA@PDA@PDA@P@@@@DA@PD@@@@A@PDA@PDA@PDA@PDA
+@P@@@PDA@PDA@@@A@PDA@PDA@PDA@PDA@@@@@PDA@PDA@@@A@PDA@PDA@PDA@PDA@@@@@PDA@PDA@@@@@PDA@PDA@PDA@PDA@@@@@@@@@@@@@@@@@PDA@PDA
+@PDA@PD@@@@@@@@@@@@@@@@@@@DA@PDA@PDA@PD@@@DA@PDA@PDA@P@@@@DA@PDA@PDA@P@@@@DA@PDA@PDA@PD@@@DA@PDA@PDA@P@@@@DA@PDA@PDA@PD@
+@@@A@PDA@PDA@P@@@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@PDA@PDA@PDA@PDA@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA') ; colorMapFromArray:#[0 0 0 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@C @@C0@@C0@@G8@@F8@@NX@@N\@@LL@@\L@@\N@@XF@@8F@@8G@@??@A?? A C C A C A0C@A0G@@0@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeUsingA32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingA32x32.xpm"
+
+    "
+     self mergeUsingA32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingA32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingA32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PD@@@@@@@DA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@@@@@DA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@@@@@@@@@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@@
+@@D@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@@@@@PD@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@@A@P@@@@DA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@@@@@PDA@@@@@@DA@PDA@PDA@PDA@PDA@PDA@PDA@PD@@@@A@PDA@@@@@PDA@PDA@PDA@PDA@PDA@PDA@PDA@@@@@@DA@PD@@@@A@PDA@PDA@PDA@PDA
+@PDA@PDA@PD@@@@A@PDA@P@@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@@@@@@DA@PDA@P@@@@DA@PDA@PDA@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@@DA@PDA
+@PDA@PDA@PDA@PDA@P@@@@DA@PDA@PDA@@@@@PDA@PDA@PDA@PDA@PDA@PD@@@@@@PDA@PDA@PD@@@@A@PDA@PDA@PDA@PDA@PDA@P@@@@DA@PDA@PDA@P@@
+@@@A@PDA@PDA@PDA@PDA@PDA@@@@@@@@@@@@@@@@@@@@@@DA@PDA@PDA@PDA@PDA@P@@@@@@@@@@@@@@@@@@@@@@@PDA@PDA@PDA@PDA@PDA@@@@@@@@@@@@
+@@@@@@@@@@@@@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@PD@@@@A@PDA@PDA@PDA@PDA@@@@@@DA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@PD@@@@A
+@PDA@PDA@PDA@PDA@P@@@@DA@PDA@PDA@PDA@@@@@@DA@PDA@PDA@PDA@PDA@@@@@PDA@PDA@PDA@PD@@@@A@PDA@PDA@PDA@PDA@PD@@@@@@PDA@PDA@PDA
+@@@@@@DA@PDA@PDA@PDA@PDA@PD@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@a') ; colorMapFromArray:#[0 0 0 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@C0@@@A<@@@@_ @@@G8@@@C.@@@@90@@@^\@@@GG @@A08@@@<N@@@NC0@@G \@@A0G @@\@8@@O@N@@C C0@@??<@@_??@@G?
+?8@C0@N@@<@C0@N@@\@G @G@A0@A8@<@@N@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeUsingAAll24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingAAll24x24.xpm"
+
+    "
+     self mergeUsingAAll24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingAAll24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingAAll24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]BX9N1]4]GQ4]GQ4]GQ4]GP@]GQ4]GP@]CA\X3L@]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4EUI\X6A4]GQ4
+]GQ4]GQ4]GP@]GQ4]GP@HU\QL6$M]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4N&E4F&$?]GQ4]GQ4]GQ4]GQ4]GQ4]GPHV$(@@6A%AWQ4]GP@]GQ4]GQ4]GQ4]GP%V!!=4
+]C%)H7Q4]GQ4]GQ4]GQ4]GP@]GQBU I4]A])P7Q4]GQ4]GQ4]GQ4]GQ4]A%VR7Q4]GQ_[P=4]GQ4]GQ4]GP@]GQ4]BEPC''Q4]GP*Z1,@]GQ4]GQ4]GQ4]GQ4
+]DUU]GQ4]GPUZ5%4]GQ4]GQ4]GP@]GQ4D%QB@GP@]GQ4W6<T]GQ4]GQ4]GQ4]GQ4J5X]]GQ4]GQ4MF44]GQ4]GQ4]GQ4]GPFQ$<:IR\-K#H2PF5&]GP@]GP@
+]GQ4]GP\S%QUV6E#YV%)[F=/F7Q4]GQ4]GP@]GP,U@!!4]@@@@GQ4@CE/OWQ4]GQ4]GQ4]AALTWQ4]GQ4]GQ4]@1/[7Q4]GQ4]GP@]A9HO''Q4]GQ4]GP@]GQI
+\"%4]GQ4]GQ4AC1GA7Q4]GP@]GP@]GP)\$Q4]GQ4]GQ4D4=N]GQ4]GQ4]GQ4]GPJ\''LK]GQ4]GP@]@@@]GQ4]GP@]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4
+]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4]GQ4') ; colorMapFromArray:#[0 0 0 2 2 0 41 49 24 48 56 26 58 75 34 66 78 35 69 87 38 68 87 40 76 95 43 77 95 44 81 92 43 87 97 47 86 98 46 87 100 47 85 105 47 86 101 48 88 112 50 93 112 52 92 115 52 91 116 52 99 113 54 96 115 54 98 114 54 100 117 55 101 118 55 96 121 55 102 121 56 110 123 59 101 129 58 105 130 60 104 134 60 110 133 61 110 137 62 111 137 63 112 128 60 115 132 62 119 132 63 114 140 63 113 138 64 115 142 65 119 143 67 120 136 64 122 142 68 116 145 66 118 151 68 121 144 66 123 147 68 127 147 69 127 154 72 128 145 69 129 149 70 129 152 71 135 151 72 130 153 72 133 153 72 135 157 73 132 163 73 135 160 74 135 165 76 136 162 76 132 169 75 146 165 79 139 176 79 147 171 81 152 174 83 143 176 80 145 179 80 164 188 90 170 188 90 155 194 88 157 198 90 158 203 91 159 204 91 170 192 92 166 200 93 168 206 95 163 208 93 165 211 95 165 212 95 168 210 95 171 211 95 168 211 97 175 211 98 168 212 96 171 214 97 175 216 98 176 215 99 178 215 99 184 209 99 184 212 101 177 216 100 178 217 100 181 218 100 181 219 101 182 218 100 185 216 101 186 217 102 185 220 102 185 221 102 186 220 103 188 223 104 190 222 105 194 219 104 192 223 104 192 223 105 192 224 105 195 226 107 198 228 108 199 228 108 201 229 108 202 230 109 204 230 109 205 231 110 207 231 111 209 233 112 212 235 113 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@C0@HK8@@G0@HO8@@F8@@O<H@N\@AN\@@\N@H\O@@XN@H=G@@8G@A??IA?? I3'' C C K I0G!!I0G@A8KA@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeUsingAAll32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingAAll32x32.xpm"
+
+    "
+     self mergeUsingAAll32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingAAll32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingAAll32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''
+):^''):^''):^''):^''):^''):^''):^''@@@@):^''):^''):^''):^''):^''):^''):^''):^''):^''C(BL#82''):^''):^''):^''):^''):^''):\@):^''):^''):\!!"H"K#0&''
+):\@):^''):^''):^''):^''):^''):^''):^'')5&IYF:WVJ^''):^''):^''):^''):^''):^''):^''):^''):\V"H%DRYBW@*^''):^''):^''):^''):^''):^''):^''@J^'')3:B
+"@8,$)T[):^''):\@)0B''):^''):^''):^''):^''):\IY(!!Z)3A]$(F''):^''):^''):^''):^''):^''):^''):^'')2FB "*'')4JW&0Z''):^''):^''):^''):^''):^''):^''
+):\AT(A:AZ^''JIFWQ0B''):^''):^''):^''):^''):^''):^'')1E: EN''):^''U).]):^''):^''):^''):^''):^''):^''):^''I''*@FZ^''):\<%9,S@J^''):^''):^''):^''
+):^''):^''):]^_VXD):^'')2&K''F:''):^''):^''):^''):^''):^''):^''F'')=QZ^''):^'')5F\''0N''):^''):^''):^''):\@)0B''):]F\7(R):^''):^''MI2_P:^''):^''
+):^''):^''):^''):^''B6Y:XJ^''):^''):\-YY:\):^''):^''):^''):^''):^''):\]\7D&):^''):^''):]J''JHM):^''):^''):^''):^''):^'')5]5]P:''):^''):^'')2R_
+''5.''):^''):^''):^''):^''):\U]WU5_XNH"X2O$)^[&9>"( J''):^''):^''):^''):^'')3E2ZWI=^''>H"H.O%9.['')>"HJ^''):^''):^''):^''):\GXWI1GS@0LC 8
+NS,>O4H%%ZNT):^''):^''):^''):^'')11)\$.''):^''):^''):^''):]T(:TJ):^''):^''):^''):^''TFM5E:^''):^''):^''):^'')4F#)EV''):^''):^''):^'')1A-[VB''
+):^''):^''):^''):^''MF>$)Z^''):^''):^''):^''H6M"J:^''):^''):\@):^''@J^''SZR%G:^''):^''):^''):]\[V4U):^''):^''):^''):^''):\4)JU0):^''):^''):^''
+FC(:L*^''):^''):^''):^''):^'')4)LS4<C):^''):^''):^''):^'')0B''):^'')0B''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''
+):^''):^''):^''):^''):^''):^''):^''):^''):^''):^''):^'')0@a') ; colorMapFromArray:#[0 0 0 12 16 6 22 26 12 35 39 18 39 48 21 41 49 22 44 51 24 42 55 25 44 52 25 44 53 25 47 52 25 45 57 26 48 60 27 54 59 28 51 61 28 51 61 29 53 67 31 54 66 31 55 67 31 59 68 32 56 72 32 57 72 32 62 75 35 61 76 34 63 80 37 64 77 36 64 80 37 70 83 38 67 87 39 69 89 39 70 88 39 76 83 40 76 86 41 72 89 40 73 89 41 78 101 45 85 98 47 87 99 47 81 102 46 82 103 46 87 101 46 88 103 47 86 104 48 86 110 50 89 106 49 93 107 50 93 114 52 94 115 53 95 115 53 91 117 52 93 121 55 96 114 53 99 115 53 100 112 54 101 113 54 98 116 54 98 117 54 101 118 55 96 123 55 101 120 55 102 119 56 102 121 57 101 122 57 105 121 57 105 123 57 108 121 58 107 127 59 111 125 60 106 128 59 108 133 60 109 136 62 114 131 61 115 133 63 115 137 63 120 135 64 113 140 64 120 136 64 124 139 67 126 141 67 127 141 68 117 150 67 126 146 69 126 156 72 128 156 71 136 153 73 141 155 75 140 164 77 136 172 78 147 171 80 145 176 81 150 180 83 156 176 83 148 190 86 157 184 86 153 191 87 155 191 87 153 194 87 153 198 88 161 206 92 161 207 93 170 203 94 175 202 94 168 205 94 169 206 95 177 201 95 166 208 95 167 208 95 167 209 95 164 211 94 165 211 95 174 206 96 183 207 98 184 204 99 167 210 96 167 213 96 168 209 96 168 211 96 170 213 97 171 214 98 172 212 97 172 213 97 174 212 97 172 215 98 175 214 98 174 215 99 175 216 99 176 215 98 177 215 99 179 214 99 184 214 100 177 216 99 178 216 99 178 217 99 180 216 99 181 217 100 180 218 100 182 218 100 183 220 101 186 216 101 186 219 102 185 221 102 186 220 102 188 221 103 188 222 103 189 222 103 189 220 104 190 224 104 191 224 105 193 217 104 197 223 106 193 224 105 193 225 105 193 225 106 194 225 106 196 227 106 196 226 107 198 228 107 200 226 107 200 228 107 201 229 108 203 229 109 203 230 109 205 231 109 206 232 110 208 233 111 211 234 112 211 234 113 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@G@@@@G0@@HA>H@@@_ @@@O<@@@#?AP@A;0@@@^^@@@O''0@@C08@@@<O @@OC0@@G ^@AQ8G @@<A8@@O@O@@C0C0@A??>@@_?? @O?
+?8@C0@O@@<@C0@^@@<@G H'' A8@A8@<@@_@@PP@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeUsingB24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingB24x24.xpm"
+
+    "
+     self mergeUsingB24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingB24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingB24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PD@@@@@@@@@@@@@@PDA@PDA@PDA@PDA@PD@@@@@@@@@@@@@@@@A@PDA@PDA@PDA@PD@@@@A@PDA@P@@@@@@
+@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@PDA@PDA@PDA@PD@@@@A@PDA
+@PDA@@@@@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@PDA@PDA@PDA@PD@@@@A@PDA@PD@@@@A@PDA@PDA@PDA@PD@@@@@@@@@@@@@@@DA@PDA@PDA@PDA@PD@
+@@@@@@@@@@@@@@@A@PDA@PDA@PDA@PD@@@@A@PDA@PD@@@@@@PDA@PDA@PDA@PD@@@@A@PDA@PDA@@@@@@DA@PDA@PDA@PD@@@@A@PDA@PDA@P@@@@DA@PDA
+@PDA@PD@@@@A@PDA@PDA@P@@@@DA@PDA@PDA@PD@@@@A@PDA@PDA@P@@@@DA@PDA@PDA@PD@@@@A@PDA@PDA@P@@@@DA@PDA@PDA@PD@@@@A@PDA@PD@@@@@
+@PDA@PDA@PDA@PD@@@@@@@@@@@@@@@@A@PDA@PDA@PDA@PD@@@@@@@@@@@@@@@DA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA') ; colorMapFromArray:#[0 0 0 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@A?8@A?>@A0_@A0G@A0G@A0G@A0G@A0G@A0N@A?<@A?>@A0O@A0G A0C A0C A0C A0C A0O@A?>@A?<@@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeUsingB32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingB32x32.xpm"
+
+    "
+     self mergeUsingB32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingB32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingB32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@@@@@@@@@@@@@@@@@@@A@PDA@PDA@PDA@PDA@PDA@PD@@@@@@@@@@@@@@@@@
+@@@@@PDA@PDA@PDA@PDA@PDA@P@@@@@@@@@@@@@@@@@@@@@@@PDA@PDA@PDA@PDA@PDA@@@@@@DA@PDA@PDA@@@@@@@A@PDA@PDA@PDA@PDA@PD@@@@@@PDA
+@PDA@PDA@@@@@@DA@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PD@@@@@@PDA@PDA@PDA@PDA@PDA@@@@@@DA@PDA@PDA@PD@@@@@@PDA@PDA@PDA@PDA@PD@
+@@@@@PDA@PDA@PDA@@@@@@DA@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PD@@@@@@PDA@PDA@PDA@PDA@PDA@@@@@@DA@PDA@PDA@@@@@@@A@PDA@PDA@PDA
+@PDA@PD@@@@@@@@@@@@@@@@@@@@@@PDA@PDA@PDA@PDA@PDA@P@@@@@@@@@@@@@@@@@@@PDA@PDA@PDA@PDA@PDA@PDA@@@@@@@@@@@@@@@@@@@@@@DA@PDA
+@PDA@PDA@PDA@PD@@@@@@PDA@PDA@PD@@@@@@@DA@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@@@@@@DA@PDA@PDA@PDA@PDA@@@@@@DA@PDA@PDA@PD@
+@@@@@PDA@PDA@PDA@PDA@PD@@@@@@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@@@@@@@A@PDA@PDA@PDA@PDA@@@@@@DA@PDA
+@PDA@PD@@@@@@@DA@PDA@PDA@PDA@PD@@@@@@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PDA@PDA@P@@@@@A@PDA@PDA@PD@@@@@@@DA@PDA@PDA@PDA@PDA@@@@
+@@@A@PDA@PDA@@@@@@@@@PDA@PDA@PDA@PDA@PD@@@@@@@@@@@@@@@@@@@@@@@DA@PDA@PDA@PDA@PDA@P@@@@@@@@@@@@@@@@@@@@@A@PDA@PDA@PDA@PDA
+@PDA@@@@@@@@@@@@@@@@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@a') ; colorMapFromArray:#[0 0 0 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@G?>@@A??8@@_??@@G G0@A8@<@@^@O@@G A8@A8@<@@^@O@@G G0@A??8@@_?8@@G?? @A8A<@@^@G @G A8@A8@^@@^@G0@G 
+A<@A8@^@@^@O @G0G8@A??<@@_?>@@G?>@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeUsingBAll24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingBAll24x24.xpm"
+
+    "
+     self mergeUsingBAll24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingBAll24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingBAll24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5<[KB80LSX7MRP W5=_W5=_W5=_W5<@W5<TRT)KSD5PTUMUO1%_W5=_W5=_W5=_W5<URT)_W5=_W15NU4<^
+W5=_W5=_W5<@W5<ORT(BW5<@W5<BQE0=W5=_W5=_W5=_W5<VRT)_W5=_W5=_G51[W5=_W5=_W5=_W5<NRT(BW5=_W5<@E51^BE<@W5=_W5=_W5<VRT)_W5=_
+W5=_HU1^W5=_W5=_W5=_W5<MRT(FW5=_W5<FI51AW5=_W5=_W5=_W5<VRT)_W5=_W5<"Q51_W5=_W5=_W5<@W5<SRT(0LSX7NC9RP0$@W5=_W5=_W5=_W5<V
+RT)JSD5PTUMUIR!!_W5=_W5=_W5<@W5<RRT(B@E<@W5<XUE &W5=_W5=_W5=_W5<VRT)_W5=_W5=_B5%]F%=_W5=_W5=_W5<PRT(CW5=_W5=_W31^N%<@W5<@
+W5=_W5<VRT)_W5=_W5=_W3I^Q%=_W5=_W5<@W5<PRT(GW5=_@E=_W3%^RE=_W5=_W5=_W5<URT)_W5=_W5=_W4I^N5=_W5=_W5<@W5<MRT(JW5=_W5<\L%1^
+W5=_W5=_W5=_W5<LRT()H2(+KSQEU5)_W5=_W5=_W5=_W5<VRT)KSD5PTUMRP%=_W5=_W5=_W5<@W5<@@E=_W0@@@@A_W5=_W5=_W5=_W5=_W5=_W5=_W5=_
+W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_W5=_') ; colorMapFromArray:#[0 0 0 19 17 6 20 18 7 21 18 7 22 19 7 23 20 8 24 22 8 30 26 10 36 34 14 45 41 17 57 47 18 78 73 29 85 69 23 88 71 24 93 75 25 93 76 25 96 78 26 97 79 26 99 81 27 107 87 29 109 88 29 117 95 32 120 97 32 113 106 43 124 114 45 125 118 47 123 120 48 130 105 35 130 119 46 134 121 47 131 124 49 132 124 49 138 126 49 142 132 52 151 139 54 159 137 49 154 140 54 150 141 56 148 142 57 158 148 58 158 150 60 161 135 49 160 139 51 161 143 53 172 141 48 162 145 55 173 144 51 171 144 52 175 147 53 175 150 54 165 154 61 164 154 62 169 154 59 175 157 60 176 153 56 177 157 59 178 160 61 170 160 65 168 164 67 172 168 68 176 166 66 178 171 69 185 168 64 186 174 69 191 179 71 191 184 75 200 189 76 206 191 76 213 199 79 221 204 79 208 203 83 223 208 82 219 213 86 235 192 66 236 196 69 238 200 72 239 205 74 240 209 77 235 217 84 233 220 88 242 214 80 243 218 83 242 223 87 244 222 85 242 227 89 245 226 88 246 227 88 247 231 91 244 230 92 245 231 93 247 233 93 244 234 95 249 235 94 248 238 96 250 240 97 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@A?8@I?>@A0_@I9O@A0G@A8O(A0G@A8O@A0N@I??@A?>@I=O@A0G A8C)A0C I8# A0C I8O@A?>@A?<@I#0@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeUsingBAll32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingBAll32x32.xpm"
+
+    "
+     self mergeUsingBAll32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingBAll32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingBAll32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L
+#H2L#H2L#H2L#H2L#H0@@@@@@@BL@@@@@H2L#H2L#H2L#H2L#H2L#H2L#H2LEE5)Z&5-\GU5]''%7T &L#H2L#H2L#H2L#H2L#H0@#H0PWV%*[WA0\WU6^W=?
+ V@B#H2L#H2L#H2L#H2L#H2L#AU]ZT8ZH2X&I"08PFFA"HTC#H2L#H2L#H2L#H2L#H2LEU5)SX2L#H2L#H2LM5FH"UBL#H2L#H2L#H2L#H2L#H0QWV%J@H2L
+#H2L#H2LGX"I!!0D@#@BL#H2L#H2L#H2L#AU]ZT6L#H2L#H2L#H0!!YX&J#H2L#H2L#H2L#H2L#H2LEE5)SX2L#H2L#H2L#H1#"X(G#H2L#H2L#H2L#H2L#H0P
+WV%J#H2L#H2L#H2LB(BI 0RL#H2L#H2L#H2L#H2L#AU]ZT6L#H2L#H2L#H09"H%E#H2L#H2L#H2L#H2L#H2LEE5)R@@@@@@@@@BLJ(FHW .L#H2L#H2L#H2L
+#H2L#H0UWV%)U%)[W6I,^W9?T3,]#H2L#H2L#H2L#H2L#H2L#AU]ZV)-[''A1]WY9_''=C#H2L#H2L#H2L#H2L#H0@#@BLC%5)S2$0L3L>O#=DY(FHP(2L#H2L
+#H2L#H2L#H2L#H0UWV%M#H2L#H2L#H0*PH"JUH2L#H2L#H2L#H2L#H2L#AM]ZT^L#H2L#H2L#H0"SH&JFH2L#H2L#H2L#H2L#H2LEU5)SX2L#H2L#H2L#H0$
+"X)<#H2L#H2L#H2L#H2L#H0UWV%M#H2L#H2L#H2L#A&I"(.L#H2L#H2L#H2L#H2L#AM]ZT*L#H2L#H2L#H2LCHJJ"0ZL#H2L#H2L#H2L#H2LEU5)SX2L#H2L
+#H2L#H0W"X*KBH2L#H2L#H2L#H2L#H0TWV%M#H2L#H2L#H2L#A6I"''6L#H2L#H2L#H2L#H2L#AA]ZT"L#H2L#H2L#H0E\(&JQ(2L#H2L#H2L#H2L#H2LEE5)
+R0BL#H2L#H2LE''RH"W,M#H2L#H2L#H2L#H2L#H0QWV%''U&9[U5-W[G:@ H!!3GH2L#H2L#H2L#H2L#H2L#AQ]ZV)-[''E1]WY9^W=$N2BL#H2L#H2L#H2L#H2L
+#H2LF24.K#D0L3L>O#87J#VL#H2L#H2L#H2L#H2L#H2L#H2L#@BL#H2L#@BL#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L
+#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#H2L#@@a') ; colorMapFromArray:#[0 0 0 8 8 3 20 18 7 23 23 9 22 21 10 35 32 13 53 53 22 56 55 21 63 61 25 64 60 24 66 61 25 67 64 26 75 71 27 80 78 31 100 80 27 101 81 27 102 82 27 103 83 28 105 84 28 105 85 28 110 88 29 112 90 30 89 81 32 91 87 34 94 92 37 100 94 38 108 91 32 117 93 32 106 102 40 107 102 41 109 103 41 110 103 41 110 106 42 114 107 42 117 110 43 127 108 40 124 117 46 127 118 46 128 112 41 129 112 41 128 114 42 134 114 41 128 118 46 129 119 47 132 118 45 141 115 40 142 116 41 142 119 42 143 121 43 143 122 44 144 124 46 145 127 47 146 127 47 134 123 50 137 125 49 136 126 49 140 127 48 138 128 51 138 131 52 140 133 53 145 128 48 144 129 49 146 130 49 145 132 50 144 132 51 144 134 53 145 138 55 150 140 54 156 142 55 153 147 59 152 148 60 162 135 48 164 137 49 166 138 49 167 139 49 175 146 52 160 151 60 177 147 52 195 162 57 206 172 61 172 165 66 186 173 69 192 178 68 199 185 73 199 190 76 213 180 64 217 182 66 211 188 71 215 189 70 215 190 71 217 185 66 217 188 69 218 188 69 235 191 66 205 195 78 219 192 70 210 198 79 214 198 77 220 194 73 212 200 80 218 203 80 217 205 81 221 204 80 231 194 69 233 195 69 236 194 68 237 198 70 226 205 78 230 206 78 238 201 72 239 204 74 239 205 74 240 207 76 241 211 78 224 210 84 224 213 85 233 216 86 242 214 80 243 217 82 242 222 86 243 223 86 244 221 84 245 221 84 233 224 91 234 227 92 239 233 94 245 224 87 246 227 89 243 229 91 247 230 91 241 230 92 241 232 94 247 233 93 246 234 94 247 235 94 245 236 95 248 234 93 249 237 95 250 240 97 251 244 99 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@O7 @@G?>@@I??8@@_??@@G G0@A<@?P@^@O@@G A8@A8@>@@^@O@@G?70@A??8@@_?8@AW?? @A8A<@@^@O @G A8@A8@^@@^@G0@G 
+A<@A8@^@@^@O @G0G8@A??<@@_?>@@G?>@@@PP@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeUsingBase24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingBase24x24.xpm"
+
+    "
+     self mergeUsingBase24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingBase24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingBase24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@@@@@@@@@@DA@PDA@PDA@PDA@PDA@PDA@@@@@@@@@@@A@PDA@PDA@PDA@PDA@PDA@@@A@PDA@@@A
+@PDA@PDA@PDA@PDA@PDA@@@A@PDA@@@A@PDA@@@@@@@A@PDA@PDA@@@A@PD@@@@A@PDA@@@@@@@@@PDA@PDA@@@@@@@@@@DA@PDA@PDA@PD@@@DA@PDA@@@A
+@PD@@@@A@PDA@PDA@PD@@@DA@PDA@@@A@PDA@P@@@PDA@@@@@@@@@@DA@PDA@@@A@PDA@P@@@PD@@@@A@PD@@@DA@PDA@@@A@PDA@P@@@PD@@@DA@PD@@@DA
+@PDA@@@A@PDA@@@@@PD@@@DA@PD@@@DA@PDA@@@@@@@@@@@A@PD@@@@@@@@@@@DA@PDA@@@@@@@@@@DA@PDA@@@@@@@@@@DA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA') ; colorMapFromArray:#[0 0 0 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@G<@@G>@@FF@@FFG0FNG8G<@LFN@LFCG<FCNLFCLLFGLLG>O<G<G<@@@@@@@@@@@@@@@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeUsingBase32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingBase32x32.xpm"
+
+    "
+     self mergeUsingBase32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingBase32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingBase32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PD@@@@@@@@@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@@@@@@@@@@@
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@@@@@PDA@PD@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@PD@@@@A@PDA@PD@@@@A@PDA@PDA@PDA@PDA@PDA@PDA@P@@@@DA
+@PDA@P@@@@DA@PDA@@@@@@@@@@DA@PDA@PDA@@@@@PDA@PDA@@@@@PDA@P@@@@@@@@@@@@DA@PDA@PD@@@@A@PDA@P@@@@DA@PDA@@DA@PDA@P@@@@DA@PDA
+@P@@@@@@@@@@@@@A@PDA@PDA@PDA@PDA@P@@@PDA@PDA@@@@@@@@@@@@@@@A@PDA@PDA@P@@@@@@@@@A@PDA@PD@@@@A@PDA@PD@@@@A@PDA@P@@@@@@@@@@
+@@DA@PDA@P@@@@DA@PDA@PD@@@DA@PD@@@@A@PDA@P@@@PDA@PDA@@@@@PDA@PDA@P@@@PDA@@@@@PDA@PDA@@@A@PDA@PD@@@@A@PDA@PDA@@@@@PD@@@@A
+@PDA@PD@@@DA@PDA@P@@@@DA@PDA@P@@@@DA@P@@@@DA@PDA@@@@@PDA@PDA@@@@@PDA@PDA@@@@@PDA@P@@@PDA@P@@@@@A@PDA@PD@@@@@@@@@@@@@@@DA
+@PDA@@@@@@@@@@@@@@DA@PDA@P@@@@@@@@@@@@@A@PDA@PDA@@@@@@@@@P@@@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA
+@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@P@a') ; colorMapFromArray:#[0 0 0 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A?0@@@_?@@@GA0@@A0N@@@\C ? G@8_<A0\DC _>@@XG?0C>A0NC? \A!!0XG@X8FA0GNA \C# 8G@8X^A?<
+G? _>@?X@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
+mergeUsingBaseAll24x24
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingBaseAll24x24.xpm"
+
+    "
+     self mergeUsingBaseAll24x24 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingBaseAll24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingBaseAll24x24'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\G@@\GA0\G@@\GA0\G@@\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0
+\GA0\GA0\G@@\GA0\G@@\G@@\G@@\GA0\GA0\GA0\GA0I2$*K"<+N''A0\GA0\GA0\GA0\GA0\G@GT!!PJCRECWDE0\G@@\GA0\G@@\GA0\GA0LB10\GA0Y$50
+\GA0\GA0\GA0\GA0\G@HLA8@\G@@IT\K\G@BH3%ISS50\GA0\GA0LB50\G@PZC]0\GA0XCL#I&5@\GA0\G@FT"$*K$IUFWA0\G@A\G@@\GA$RGA0\GA0TQ50
+\GADN4Y0\GA0\GA0\GAMTGA0\G@ELAI0\G@@C5X[\GA0F$!!PTE!!%TGA0\GA0LB10\GA0\F0=\G@[ZSQ0\GAYTGA0\G@GLA90\G@@@606\GA+L''A0\G@WTG@@
+\GA0LB10\GA0FV(5\GA/PGA0\GA-TGA0\G@ELADLEP8VY4E0@GA[VC ID4=MTGA0\GA0UE5^XVM"IGA0\GA0YF=-V!!< TGA0\G@@\G@@\G@@\GA0\G@@\GA0
+\GA0\GA0\GA0\G@@\GA0\G@@\G@@\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\G@@\GA0\GA0\G@@\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0
+\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0\GA0') ; colorMapFromArray:#[0 0 0 7 9 10 13 20 22 18 28 32 21 40 52 21 41 52 25 48 62 26 50 64 29 55 71 53 76 87 49 84 102 60 89 100 52 90 109 59 96 117 62 100 118 66 99 116 67 102 121 61 105 132 62 109 137 79 116 130 64 112 140 73 117 143 78 120 142 83 121 137 80 122 141 81 122 142 86 123 141 87 124 142 87 126 142 66 118 147 70 124 156 89 127 144 87 128 145 81 128 151 90 129 148 91 131 148 87 132 153 90 135 157 98 139 159 74 134 168 78 137 170 78 138 171 84 142 174 94 146 172 82 144 181 83 147 182 90 146 177 94 150 178 81 147 184 82 148 186 97 142 161 99 144 165 100 145 165 103 148 167 103 150 170 103 151 174 106 152 173 106 154 175 100 153 178 103 155 180 106 155 179 108 155 178 109 156 179 109 157 179 110 157 179 107 156 180 99 157 187 102 157 186 103 159 190 111 160 181 109 163 187 111 163 188 112 160 182 113 163 187 114 165 188 114 166 188 114 167 189 112 165 190 116 167 190 117 167 191 116 168 191 87 158 198 88 160 202 89 162 203 92 167 210 110 169 199 113 166 192 117 169 192 118 171 194 119 171 195 121 175 199 121 175 201 116 176 205 98 172 214 105 178 218 127 183 209 127 185 210 112 183 221 122 187 222 119 189 225 132 189 216 133 193 219 130 195 228 131 199 231 132 198 230 139 201 229 138 204 235 141 205 233 139 205 236 145 210 239 146 211 240 147 211 240 0 0 0]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@HHH@@@@@HIH@G<@@O>HHFF@@OOO0FNG8O<ILFN@LNOG<FCNLNOLMFGLLO>/<G<G<IHH@AAH@@@@@HA@@@@@@@@@@') ; yourself); yourself]
+!
+
+mergeUsingBaseAll32x32
+"      Loaded from: /home/jv/work/icons/merge-tool-icons/mergeUsingBaseAll32x32.xpm"
+
+    "
+     self mergeUsingBaseAll32x32 inspect
+     ImageEditor openOnClass:self andSelector:#mergeUsingBaseAll32x32
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary mergeUsingBaseAll32x32'
+        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O
+#8>O#8>O#8>O#8>O#8>O#8>O#8>O#0BO#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8<@#8>O#8>O#8>O#8>O#8>O
+#8<@#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8<SIR(/P4YJRB6O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#2U$YVY2Y75> U\=
+#8>O#8>O#8>O#8<@#0BO#8>O#8>OQVPO#8>O#8=]!!U.O#8>O#8>O#8>O#8>O#8>O#8>O#8=EYA&O#8>O#8>C!!#RO#8>O#8>O#8>O#8>O#8>O#8>O#2!!$EH>O
+#8>O#36FHH>O#8<DE#EPUUEBZ8>O#8>O#8>OQVPY#8>O#8>O[XX^#8>O#1:I#X6M#X5*TX>O#8>O#8<(YAJO#8>OAQFEXH>O#8>OA0\A@@@@@6)1S8>O#8>O
+#4U$I2=CQ$!!K_3>O#8>O#8>O#8>O#8>O#85Q#8>O#8>OQVQ3]GY8_W9XKE:O#8>O#8>O#2D7N38U#%*O#8>O#8<ZY@*O@@BO@P.@T16O#8>O#4I/#H6M#X6M
+WH>O#8>O#4U$FX>O#8>O#8>FSH>O#8=0#U&O#8>O#85##8>O#8>OK&PT#8>O#0BO@(Y*E(>OEX0;#8>O#8<@"&NO#8>O#8=EYA&O#8>O#8>O!!(H!!#8<4#CFO
+#8>O#8>MX8>O#8>O#4U$FX>O#8>O#1BF^(>O#3RMP(>O#8>OMH5##8>O#8<@IFPR#8>O#8>OXXX;#8>OBX5PGH>O#1VD#VNO#8>O#8=EYBL&J3@9R''&E[(>O
+#8>O!!81_UT5N"P"MX8>O#8>O#4U$\7Q6^G5>^1"O#8>O#8>OX(6N#V,L#85##8>O#8>O@@BO@@BO#0BO#8>O#8>O#8<@@H>O#8>O#8>O#8>O#8>O#8>O#8>O
+#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8<@#8>O@H>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O
+#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#0BO#8>O#0BO#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O
+#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#8>O#0@a') ; colorMapFromArray:#[0 0 0 2 2 4 13 22 24 20 29 34 37 56 63 38 61 71 40 57 65 40 59 66 43 62 72 47 69 79 41 74 92 50 77 91 54 80 90 63 90 102 63 90 103 48 85 106 59 90 104 62 94 111 52 93 116 51 95 122 56 99 123 66 95 108 69 100 113 70 100 112 70 107 125 60 107 133 60 112 144 63 118 150 79 114 130 82 119 137 84 122 139 85 122 139 83 122 140 87 124 140 87 125 141 65 116 145 65 121 155 67 122 154 71 123 153 70 123 155 66 123 157 66 124 158 70 125 156 75 125 154 83 125 146 82 127 149 67 125 160 74 128 158 79 130 156 88 128 145 89 128 146 88 130 147 90 131 149 91 131 149 90 131 150 92 131 149 92 133 151 83 133 159 92 134 152 93 134 153 91 134 156 89 135 158 94 136 153 90 137 159 95 136 156 95 137 156 96 138 157 78 131 160 72 134 171 73 136 174 81 134 162 86 135 160 85 136 163 85 137 163 86 137 162 95 150 177 97 143 163 99 143 162 100 146 166 103 147 167 102 148 168 103 148 169 102 149 169 100 150 173 104 149 170 105 152 173 106 154 174 100 152 177 101 156 183 107 154 176 107 155 176 105 156 181 110 159 181 103 157 185 109 159 186 110 160 182 109 161 187 107 162 189 114 165 186 116 168 191 91 166 210 95 168 210 97 166 205 104 171 206 116 169 193 118 170 194 119 171 194 119 171 196 120 173 197 116 175 205 118 178 206 123 178 202 124 178 204 125 181 206 102 171 209 96 170 213 101 174 214 101 174 215 105 179 218 106 178 218 111 183 221 117 181 213 127 185 212 120 185 218 116 186 224 116 187 224 121 191 226 124 190 225 126 192 223 126 194 228 135 196 225 129 195 229 136 197 224 131 199 232 136 203 235 142 203 232 141 204 232 143 206 234 143 207 235 144 208 236 144 209 237 146 211 240 146 212 240 0 0 0]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@B@@@@@@@@H@@H@@@@@@A?0@@@_?@APGA0@@A0N@@@\C!!? G@8_<A0<G? _>@@XG?0C>A6>C? \A!!0XGB<8NA0GNA \C# 8O@8<^A?<
+G? _>@?XF2@L@@@@@@@@@H @@@@@@@@@@@@@PP@@@@@@@@@@@@@b') ; yourself); yourself]
+! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-tools-FileBrowser'!
 
 changesBrowserIcon
@@ -9593,6 +10231,7 @@
 	ifAbsentPut:[(Depth4Image new) width: 13; height: 11; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@;.;.;.8P@N??????D@C/?????1@@;?????<P@N??????D@C/?????1@@;?????<P@N??????D@@QDQDQDQ@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 13; height: 11; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'??#?>O?8??#?>O?8??#?>O?8??#?>@@a') ; yourself); yourself]
 ! !
 
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-tools-UIPainter'!
 
 copyWidgetIcon
@@ -10348,11 +10987,11 @@
 !GenericToolbarIconLibrary class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/GenericToolbarIconLibrary.st,v 1.170 2012-11-06 00:40:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/GenericToolbarIconLibrary.st,v 1.171 2013-01-17 17:06:23 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/GenericToolbarIconLibrary.st,v 1.170 2012-11-06 00:40:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/GenericToolbarIconLibrary.st,v 1.171 2013-01-17 17:06:23 vrany Exp $'
 ! !
 
 GenericToolbarIconLibrary initialize!