Mercurial Repositories > eric / changeset
changeset
Merged with the default branch.
Sat, 05 Dec 2020 18:13:05 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 05 Dec 2020 18:13:05 +0100
- branch
- multi_processing
- changeset 7855
- de7ce3542025
- parent 7853
- 35dcac32984a (current diff)
- parent 7854
- dc28e707a0d9 (diff)
- child 7856
- 82c461fa8a68
Merged with the default branch.
--- a/eric6/icons/breeze-dark/vcsMerge.svg Sat Dec 05 18:02:17 2020 +0100 +++ b/eric6/icons/breeze-dark/vcsMerge.svg Sat Dec 05 18:13:05 2020 +0100 @@ -1,4 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><defs><style type="text/css">.ColorScheme-Text { +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + viewBox="0 0 22 22" + id="svg18" + sodipodi:docname="vcsMerge.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + <metadata + id="metadata22"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1497" + inkscape:window-height="1031" + id="namedview20" + showgrid="false" + inkscape:zoom="32.5" + inkscape:cx="11" + inkscape:cy="11" + inkscape:window-x="326" + inkscape:window-y="280" + inkscape:window-maximized="0" + inkscape:current-layer="svg18" /> + <defs + id="defs4"> + <style + type="text/css" + id="style2">.ColorScheme-Text { color:#eff0f1 - }</style></defs><g fill="currentColor"><path class="ColorScheme-Text" d="m5 13a4 1.5 0 0 0-4 1.5v5a4 1.5 0 0 0 4 1.5 4 1.5 0 0 0 4-1.5v-5a4 1.5 0 0 0-4-1.5zm0 0.5a3.5 1 0 0 1 3.5 1 3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1 3.5 1 0 0 1 3.5-1zm3.5 1.7227v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734zm0 2.5v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734z" color="#eff0f1"/><path class="ColorScheme-Text" d="m17 13a4 1.5 0 0 0-4 1.5v5a4 1.5 0 0 0 4 1.5 4 1.5 0 0 0 4-1.5v-5a4 1.5 0 0 0-4-1.5zm0 0.5a3.5 1 0 0 1 3.5 1 3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1 3.5 1 0 0 1 3.5-1zm3.5 1.7227v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734zm0 2.5v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734z" color="#eff0f1"/><path class="ColorScheme-Text" d="m11 1a4 1.5 0 0 0-4 1.5v5a4 1.5 0 0 0 4 1.5 4 1.5 0 0 0 4-1.5v-5a4 1.5 0 0 0-4-1.5zm0 0.5a3.5 1 0 0 1 3.5 1 3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1 3.5 1 0 0 1 3.5-1zm3.5 1.7227v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734zm0 2.5v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734z" color="#eff0f1"/></g><path d="m8.7594 14.5-1.9198-2-1.9198 2-1.9198-2 1.9198-2-1.9198-2 6.7193-0.99999-0.95989 7" fill="#5fd35f"/><path d="m13.241 14.5 1.9198-2 1.9198 2 1.9198-2-1.9198-2 1.9198-2-6.7193-0.99999 0.95989 7" fill="#5fd35f"/></svg> + }</style> + </defs> + <g + fill="currentColor" + id="g12" + style="fill:#eff0f1;fill-opacity:1"> + <path + class="ColorScheme-Text" + d="m5 13a4 1.5 0 0 0-4 1.5v5a4 1.5 0 0 0 4 1.5 4 1.5 0 0 0 4-1.5v-5a4 1.5 0 0 0-4-1.5zm0 0.5a3.5 1 0 0 1 3.5 1 3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1 3.5 1 0 0 1 3.5-1zm3.5 1.7227v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734zm0 2.5v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734z" + color="#eff0f1" + id="path6" + style="fill:#eff0f1;fill-opacity:1" /> + <path + class="ColorScheme-Text" + d="m17 13a4 1.5 0 0 0-4 1.5v5a4 1.5 0 0 0 4 1.5 4 1.5 0 0 0 4-1.5v-5a4 1.5 0 0 0-4-1.5zm0 0.5a3.5 1 0 0 1 3.5 1 3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1 3.5 1 0 0 1 3.5-1zm3.5 1.7227v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734zm0 2.5v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734z" + color="#eff0f1" + id="path8" + style="fill:#eff0f1;fill-opacity:1" /> + <path + class="ColorScheme-Text" + d="m11 1a4 1.5 0 0 0-4 1.5v5a4 1.5 0 0 0 4 1.5 4 1.5 0 0 0 4-1.5v-5a4 1.5 0 0 0-4-1.5zm0 0.5a3.5 1 0 0 1 3.5 1 3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1 3.5 1 0 0 1 3.5-1zm3.5 1.7227v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734zm0 2.5v1.7773a3.5 1 0 0 1-3.5 1 3.5 1 0 0 1-3.5-1v-1.7744a4 1.5 0 0 0 3.5 0.77441 4 1.5 0 0 0 3.5-0.77734z" + color="#eff0f1" + id="path10" + style="fill:#eff0f1;fill-opacity:1" /> + </g> + <path + d="m8.7594 14.5-1.9198-2-1.9198 2-1.9198-2 1.9198-2-1.9198-2 6.7193-0.99999-0.95989 7" + fill="#5fd35f" + id="path14" /> + <path + d="m13.241 14.5 1.9198-2 1.9198 2 1.9198-2-1.9198-2 1.9198-2-6.7193-0.99999 0.95989 7" + fill="#5fd35f" + id="path16" /> +</svg>
