1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/tour-merge-pull.svg	Sat Jul 10 16:21:26 2010 +0100
     1.3 @@ -0,0 +1,297 @@
     1.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     1.5 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
     1.6 +<svg
     1.7 +   xmlns:dc="http://purl.org/dc/elements/1.1/"
     1.8 +   xmlns:cc="http://creativecommons.org/ns#"
     1.9 +   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    1.10 +   xmlns:svg="http://www.w3.org/2000/svg"
    1.11 +   xmlns="http://www.w3.org/2000/svg"
    1.12 +   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    1.13 +   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    1.14 +   width="744.09448819"
    1.15 +   height="1052.3622047"
    1.16 +   id="svg2"
    1.17 +   sodipodi:version="0.32"
    1.18 +   inkscape:version="0.46"
    1.19 +   sodipodi:docname="tour-merge-pull.svg"
    1.20 +   sodipodi:docbase="/home/bos/hg/hgbook/en"
    1.21 +   inkscape:output_extension="org.inkscape.output.svg.inkscape">
    1.22 +  <defs
    1.23 +     id="defs4">
    1.24 +    <inkscape:perspective
    1.25 +       sodipodi:type="inkscape:persp3d"
    1.26 +       inkscape:vp_x="0 : 526.18109 : 1"
    1.27 +       inkscape:vp_y="0 : 1000 : 0"
    1.28 +       inkscape:vp_z="744.09448 : 526.18109 : 1"
    1.29 +       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
    1.30 +       id="perspective2979" />
    1.31 +    <marker
    1.32 +       inkscape:stockid="Arrow1Mstart"
    1.33 +       orient="auto"
    1.34 +       refY="0.0"
    1.35 +       refX="0.0"
    1.36 +       id="Arrow1Mstart"
    1.37 +       style="overflow:visible">
    1.38 +      <path
    1.39 +         id="path2973"
    1.40 +         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
    1.41 +         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
    1.42 +         transform="scale(0.4) translate(10,0)" />
    1.43 +    </marker>
    1.44 +    <marker
    1.45 +       inkscape:stockid="Arrow1Mend"
    1.46 +       orient="auto"
    1.47 +       refY="0.0"
    1.48 +       refX="0.0"
    1.49 +       id="Arrow1Mend"
    1.50 +       style="overflow:visible;">
    1.51 +      <path
    1.52 +         id="path3066"
    1.53 +         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
    1.54 +         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
    1.55 +         transform="scale(0.4) rotate(180) translate(10,0)" />
    1.56 +    </marker>
    1.57 +  </defs>
    1.58 +  <sodipodi:namedview
    1.59 +     id="base"
    1.60 +     pagecolor="#ffffff"
    1.61 +     bordercolor="#666666"
    1.62 +     borderopacity="1.0"
    1.63 +     gridtolerance="10000"
    1.64 +     guidetolerance="10"
    1.65 +     objecttolerance="10"
    1.66 +     inkscape:pageopacity="0.0"
    1.67 +     inkscape:pageshadow="2"
    1.68 +     inkscape:zoom="1.4"
    1.69 +     inkscape:cx="233.63208"
    1.70 +     inkscape:cy="704.83702"
    1.71 +     inkscape:document-units="px"
    1.72 +     inkscape:current-layer="layer1"
    1.73 +     inkscape:window-width="906"
    1.74 +     inkscape:window-height="659"
    1.75 +     inkscape:window-x="237"
    1.76 +     inkscape:window-y="103"
    1.77 +     showgrid="false" />
    1.78 +  <metadata
    1.79 +     id="metadata7">
    1.80 +    <rdf:RDF>
    1.81 +      <cc:Work
    1.82 +         rdf:about="">
    1.83 +        <dc:format>image/svg+xml</dc:format>
    1.84 +        <dc:type
    1.85 +           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    1.86 +      </cc:Work>
    1.87 +    </rdf:RDF>
    1.88 +  </metadata>
    1.89 +  <g
    1.90 +     inkscape:label="Layer 1"
    1.91 +     inkscape:groupmode="layer"
    1.92 +     id="layer1">
    1.93 +    <text
    1.94 +       xml:space="preserve"
    1.95 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
    1.96 +       x="173.57143"
    1.97 +       y="443.79074"
    1.98 +       id="text2832"><tspan
    1.99 +         sodipodi:role="line"
   1.100 +         id="tspan2834"
   1.101 +         x="173.57143"
   1.102 +         y="443.79074" /></text>
   1.103 +    <rect
   1.104 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.105 +       id="rect1878"
   1.106 +       width="94.285713"
   1.107 +       height="20.714285"
   1.108 +       x="138"
   1.109 +       y="479.50504" />
   1.110 +    <text
   1.111 +       xml:space="preserve"
   1.112 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.113 +       x="162.09892"
   1.114 +       y="493.12619"
   1.115 +       id="text1872"><tspan
   1.116 +         sodipodi:role="line"
   1.117 +         id="tspan1874"
   1.118 +         x="162.09892"
   1.119 +         y="493.12619"
   1.120 +         style="font-family:Courier"><tspan
   1.121 +   style="font-weight:bold"
   1.122 +   id="tspan1876">0</tspan>: REV0</tspan></text>
   1.123 +    <rect
   1.124 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.125 +       id="rect2800"
   1.126 +       width="94.285713"
   1.127 +       height="20.714285"
   1.128 +       x="138"
   1.129 +       y="432.63004" />
   1.130 +    <text
   1.131 +       xml:space="preserve"
   1.132 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.133 +       x="162.09892"
   1.134 +       y="446.25119"
   1.135 +       id="text2794"><tspan
   1.136 +         sodipodi:role="line"
   1.137 +         id="tspan2796"
   1.138 +         x="162.09892"
   1.139 +         y="446.25119"
   1.140 +         style="font-family:Courier"><tspan
   1.141 +   id="tspan2868"
   1.142 +   style="font-weight:bold">1</tspan>: REV1</tspan></text>
   1.143 +    <rect
   1.144 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.145 +       id="rect2810"
   1.146 +       width="94.285713"
   1.147 +       height="20.714285"
   1.148 +       x="138"
   1.149 +       y="385.75504" />
   1.150 +    <text
   1.151 +       xml:space="preserve"
   1.152 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.153 +       x="162.09892"
   1.154 +       y="399.37619"
   1.155 +       id="text2804"><tspan
   1.156 +         sodipodi:role="line"
   1.157 +         id="tspan2806"
   1.158 +         x="162.09892"
   1.159 +         y="399.37619"
   1.160 +         style="font-family:Courier"><tspan
   1.161 +   style="font-weight:bold"
   1.162 +   id="tspan2866">2</tspan>: REV2</tspan></text>
   1.163 +    <rect
   1.164 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.165 +       id="rect2820"
   1.166 +       width="94.285713"
   1.167 +       height="20.714285"
   1.168 +       x="138"
   1.169 +       y="338.88007" />
   1.170 +    <text
   1.171 +       xml:space="preserve"
   1.172 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.173 +       x="162.09892"
   1.174 +       y="352.50122"
   1.175 +       id="text2814"><tspan
   1.176 +         sodipodi:role="line"
   1.177 +         id="tspan2816"
   1.178 +         x="162.09892"
   1.179 +         y="352.50122"
   1.180 +         style="font-family:Courier"><tspan
   1.181 +   style="font-weight:bold"
   1.182 +   id="tspan2864">3</tspan>: REV3</tspan></text>
   1.183 +    <rect
   1.184 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.185 +       id="rect2830"
   1.186 +       width="94.285713"
   1.187 +       height="20.714285"
   1.188 +       x="138"
   1.189 +       y="292.00504" />
   1.190 +    <text
   1.191 +       xml:space="preserve"
   1.192 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.193 +       x="162.09892"
   1.194 +       y="305.62619"
   1.195 +       id="text2824"><tspan
   1.196 +         sodipodi:role="line"
   1.197 +         id="tspan2826"
   1.198 +         x="162.09892"
   1.199 +         y="305.62619"
   1.200 +         style="font-family:Courier"><tspan
   1.201 +   style="font-weight:bold"
   1.202 +   id="tspan2862">4</tspan>: REV4</tspan></text>
   1.203 +    <path
   1.204 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
   1.205 +       d="M 185.14286,478.50504 L 185.14286,454.34432"
   1.206 +       id="path2894"
   1.207 +       inkscape:connector-type="polyline" />
   1.208 +    <path
   1.209 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
   1.210 +       d="M 185.14286,431.63004 L 185.14286,407.46932"
   1.211 +       id="path2896"
   1.212 +       inkscape:connector-type="polyline" />
   1.213 +    <path
   1.214 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
   1.215 +       d="M 185.14286,384.75504 L 185.14286,360.59435"
   1.216 +       id="path2898"
   1.217 +       inkscape:connector-type="polyline" />
   1.218 +    <path
   1.219 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
   1.220 +       d="M 185.14286,337.88007 L 185.14286,313.71932"
   1.221 +       id="path2900"
   1.222 +       inkscape:connector-type="polyline" />
   1.223 +    <rect
   1.224 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.225 +       id="rect2863"
   1.226 +       width="94.285713"
   1.227 +       height="20.714285"
   1.228 +       x="91.428574"
   1.229 +       y="244.71933" />
   1.230 +    <text
   1.231 +       xml:space="preserve"
   1.232 +       style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.233 +       x="116.09886"
   1.234 +       y="258.80865"
   1.235 +       id="text1965"
   1.236 +       transform="scale(1.000002,0.999998)"><tspan
   1.237 +         sodipodi:role="line"
   1.238 +         id="tspan1967"
   1.239 +         x="116.09886"
   1.240 +         y="258.80865"
   1.241 +         style="font-family:Courier"><tspan
   1.242 +   style="font-weight:bold"
   1.243 +   id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text>
   1.244 +    <path
   1.245 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
   1.246 +       d="M 173.95727,291.00504 L 149.75702,266.43361"
   1.247 +       id="path1971"
   1.248 +       inkscape:connector-type="polyline"
   1.249 +       inkscape:connection-end="#rect2863"
   1.250 +       inkscape:connection-start="#rect2830" />
   1.251 +    <rect
   1.252 +       style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   1.253 +       id="rect2911"
   1.254 +       width="94.285995"
   1.255 +       height="20.714283"
   1.256 +       x="186.71414"
   1.257 +       y="198.6479" />
   1.258 +    <text
   1.259 +       xml:space="preserve"
   1.260 +       style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   1.261 +       x="210.81311"
   1.262 +       y="212.26949"
   1.263 +       id="text2913"
   1.264 +       transform="scale(1.000002,0.999998)"><tspan
   1.265 +         sodipodi:role="line"
   1.266 +         id="tspan2915"
   1.267 +         x="210.81311"
   1.268 +         y="212.26949"
   1.269 +         style="font-family:Courier"><tspan
   1.270 +   id="tspan1966"
   1.271 +   style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text>
   1.272 +    <path
   1.273 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
   1.274 +       d="M 191.06908,291.00504 L 227.93092,220.36218"
   1.275 +       id="path2919"
   1.276 +       inkscape:connector-type="polyline"
   1.277 +       inkscape:connection-start="#rect2830" />
   1.278 +    <text
   1.279 +       xml:space="preserve"
   1.280 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
   1.281 +       x="291"
   1.282 +       y="225.3813"
   1.283 +       id="text2871"><tspan
   1.284 +         sodipodi:role="line"
   1.285 +         id="tspan2873"
   1.286 +         x="291"
   1.287 +         y="225.3813">tip (y principal)</tspan></text>
   1.288 +    <text
   1.289 +       xml:space="preserve"
   1.290 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
   1.291 +       x="76"
   1.292 +       y="259.16046"
   1.293 +       id="text2875"><tspan
   1.294 +         sodipodi:role="line"
   1.295 +         id="tspan2877"
   1.296 +         x="76"
   1.297 +         y="259.16046"
   1.298 +         style="text-align:end;text-anchor:end">principal</tspan></text>
   1.299 +  </g>
   1.300 +</svg>