Merge remote-tracking branch 'upstream/master'HEADmaster

Resolved conflicts by reordering of files

1 files changed, 0 insertions, 139 deletions

diff --git a/signs_road/svg/signs_blue_street.svg b/signs_road/svg/signs_blue_street.svg
deleted file mode 100644
index 0aa87ff..0000000
--- a/signs_road/svg/signs_blue_street.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   width="32px"
-   height="32px"
-   id="svg2985"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="dessin.svg"
-   inkscape:export-filename="/home/pyrollo/dev/minetest-mods/signs/textures/signs_blue_street_inv.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs2987" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="-5.016165"
-     inkscape:cy="21.417081"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     borderlayer="true"
-     inkscape:window-width="1239"
-     inkscape:window-height="776"
-     inkscape:window-x="41"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2993"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       color="#ff5000"
-       opacity="0.1254902" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2990">
-    <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>
-  <g
-     id="layer1"
-     inkscape:label="Inv"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <rect
-       style="color:#000000;fill:#000040;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2995"
-       width="28"
-       height="24"
-       x="2"
-       y="4"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="display:inline;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.5,8.5 0,15 c 1.5,0 3,1.5 3,3 l 19,0 c 0,-1.5 1.5,-3 3,-3 l 0,-15 c -1.5,0 -3,-1.5 -3,-3 l -19,0 c 0,1.5 -1.5,3 -3,3 z"
-       id="path3018"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="display:inline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
-       id="path3010"
-       sodipodi:cx="2"
-       sodipodi:cy="6"
-       sodipodi:rx="1"
-       sodipodi:ry="1"
-       d="M 3,6 A 1,1 0 1 1 1,6 1,1 0 1 1 3,6 z"
-       transform="translate(2,0)" />
-    <path
-       sodipodi:type="arc"
-       style="display:inline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
-       id="path3012"
-       sodipodi:cx="30"
-       sodipodi:cy="6"
-       sodipodi:rx="1"
-       sodipodi:ry="1"
-       d="m 31,6 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="translate(-2,0)" />
-    <path
-       sodipodi:type="arc"
-       style="display:inline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
-       id="path3014"
-       sodipodi:cx="2"
-       sodipodi:cy="26"
-       sodipodi:rx="1"
-       sodipodi:ry="1"
-       d="m 3,26 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="translate(2,0)" />
-    <path
-       sodipodi:type="arc"
-       style="display:inline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;overflow:visible;enable-background:accumulate"
-       id="path3016"
-       sodipodi:cx="30"
-       sodipodi:cy="26"
-       sodipodi:rx="1"
-       sodipodi:ry="1"
-       d="m 31,26 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="translate(-2,0)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Tour"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#000040;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 0,0 0,32 32,32 32,0 0,0 z M 2,4 30,4 30,28 2,28 2,4 z"
-       id="rect2995-0"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>