hgbook
annotate es/tour-merge-conflict.svg @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | |
children |
rev | line source |
---|---|
igor@333 | 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
igor@333 | 2 <!-- Created with Inkscape (http://www.inkscape.org/) --> |
igor@333 | 3 <svg |
igor@333 | 4 xmlns:dc="http://purl.org/dc/elements/1.1/" |
igor@333 | 5 xmlns:cc="http://creativecommons.org/ns#" |
igor@333 | 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
igor@333 | 7 xmlns:svg="http://www.w3.org/2000/svg" |
igor@333 | 8 xmlns="http://www.w3.org/2000/svg" |
igor@333 | 9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
igor@333 | 10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
igor@333 | 11 width="744.09448819" |
igor@333 | 12 height="1052.3622047" |
igor@333 | 13 id="svg2" |
igor@333 | 14 sodipodi:version="0.32" |
igor@333 | 15 inkscape:version="0.46" |
igor@333 | 16 sodipodi:docname="tour-merge-conflict.svg" |
igor@333 | 17 inkscape:output_extension="org.inkscape.output.svg.inkscape"> |
igor@333 | 18 <defs |
igor@333 | 19 id="defs4"> |
igor@333 | 20 <inkscape:perspective |
igor@333 | 21 sodipodi:type="inkscape:persp3d" |
igor@333 | 22 inkscape:vp_x="0 : 526.18109 : 1" |
igor@333 | 23 inkscape:vp_y="0 : 1000 : 0" |
igor@333 | 24 inkscape:vp_z="744.09448 : 526.18109 : 1" |
igor@333 | 25 inkscape:persp3d-origin="372.04724 : 350.78739 : 1" |
igor@333 | 26 id="perspective2861" /> |
igor@333 | 27 <marker |
igor@333 | 28 inkscape:stockid="Arrow1Mend" |
igor@333 | 29 orient="auto" |
igor@333 | 30 refY="0.0" |
igor@333 | 31 refX="0.0" |
igor@333 | 32 id="Arrow1Mend" |
igor@333 | 33 style="overflow:visible;"> |
igor@333 | 34 <path |
igor@333 | 35 id="path3053" |
igor@333 | 36 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 " |
igor@333 | 37 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" |
igor@333 | 38 transform="scale(0.4) rotate(180) translate(10,0)" /> |
igor@333 | 39 </marker> |
igor@333 | 40 </defs> |
igor@333 | 41 <sodipodi:namedview |
igor@333 | 42 id="base" |
igor@333 | 43 pagecolor="#ffffff" |
igor@333 | 44 bordercolor="#666666" |
igor@333 | 45 borderopacity="1.0" |
igor@333 | 46 gridtolerance="10000" |
igor@333 | 47 guidetolerance="10" |
igor@333 | 48 objecttolerance="10" |
igor@333 | 49 inkscape:pageopacity="0.0" |
igor@333 | 50 inkscape:pageshadow="2" |
igor@333 | 51 inkscape:zoom="1.4" |
igor@333 | 52 inkscape:cx="251.65243" |
igor@333 | 53 inkscape:cy="733.42197" |
igor@333 | 54 inkscape:document-units="px" |
igor@333 | 55 inkscape:current-layer="layer1" |
igor@333 | 56 inkscape:window-width="906" |
igor@333 | 57 inkscape:window-height="659" |
igor@333 | 58 inkscape:window-x="5" |
igor@333 | 59 inkscape:window-y="49" |
igor@333 | 60 showgrid="false" /> |
igor@333 | 61 <metadata |
igor@333 | 62 id="metadata7"> |
igor@333 | 63 <rdf:RDF> |
igor@333 | 64 <cc:Work |
igor@333 | 65 rdf:about=""> |
igor@333 | 66 <dc:format>image/svg+xml</dc:format> |
igor@333 | 67 <dc:type |
igor@333 | 68 rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
igor@333 | 69 </cc:Work> |
igor@333 | 70 </rdf:RDF> |
igor@333 | 71 </metadata> |
igor@333 | 72 <g |
igor@333 | 73 inkscape:label="Layer 1" |
igor@333 | 74 inkscape:groupmode="layer" |
igor@333 | 75 id="layer1"> |
igor@333 | 76 <g |
igor@333 | 77 id="g1988" |
igor@333 | 78 transform="translate(84.85711,0)"> |
igor@333 | 79 <g |
igor@333 | 80 id="g1876"> |
igor@333 | 81 <path |
igor@333 | 82 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
igor@333 | 83 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " |
igor@333 | 84 id="path1872" |
igor@333 | 85 sodipodi:nodetypes="cccccc" /> |
igor@333 | 86 <path |
igor@333 | 87 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
igor@333 | 88 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" |
igor@333 | 89 id="path1874" |
igor@333 | 90 sodipodi:nodetypes="cccc" /> |
igor@333 | 91 </g> |
igor@333 | 92 <flowRoot |
igor@333 | 93 style="font-size:8px;font-family:Times New Roman" |
igor@333 | 94 id="flowRoot1898" |
igor@333 | 95 xml:space="preserve"><flowRegion |
igor@333 | 96 id="flowRegion1900"><rect |
igor@333 | 97 style="font-size:8px;font-family:Times New Roman" |
igor@333 | 98 y="464.50504" |
igor@333 | 99 x="122.85714" |
igor@333 | 100 height="93.571426" |
igor@333 | 101 width="76.428574" |
igor@333 | 102 id="rect1902" /></flowRegion><flowPara |
igor@333 | 103 id="flowPara1904">Saludos!</flowPara><flowPara |
igor@333 | 104 id="flowPara1906" /><flowPara |
igor@333 | 105 id="flowPara1908">Soy Mariam Abacha, la esposa del anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot> </g> |
igor@333 | 106 <g |
igor@333 | 107 id="g1966" |
igor@333 | 108 transform="translate(82,0.35715)"> |
igor@333 | 109 <g |
igor@333 | 110 transform="translate(-77.85718,-140.0714)" |
igor@333 | 111 id="g1910"> |
igor@333 | 112 <path |
igor@333 | 113 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
igor@333 | 114 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " |
igor@333 | 115 id="path1912" |
igor@333 | 116 sodipodi:nodetypes="cccccc" /> |
igor@333 | 117 <path |
igor@333 | 118 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
igor@333 | 119 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" |
igor@333 | 120 id="path1914" |
igor@333 | 121 sodipodi:nodetypes="cccc" /> |
igor@333 | 122 </g> |
igor@333 | 123 <flowRoot |
igor@333 | 124 transform="translate(-77.85718,-140.0714)" |
igor@333 | 125 style="font-size:8px;font-family:Times New Roman" |
igor@333 | 126 id="flowRoot1916" |
igor@333 | 127 xml:space="preserve"><flowRegion |
igor@333 | 128 id="flowRegion1918"><rect |
igor@333 | 129 style="font-size:8px;font-family:Times New Roman" |
igor@333 | 130 y="464.50504" |
igor@333 | 131 x="122.85714" |
igor@333 | 132 height="93.571426" |
igor@333 | 133 width="76.428574" |
igor@333 | 134 id="rect1920" /></flowRegion><flowPara |
igor@333 | 135 id="flowPara1922">Saludos!</flowPara><flowPara |
igor@333 | 136 id="flowPara1924" /><flowPara |
igor@333 | 137 id="flowPara1926">Soy <flowSpan |
igor@333 | 138 style="font-style:italic;fill:#ff0000" |
igor@333 | 139 id="flowSpan3094">Shehu Musa Abacha, sobrina del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot> </g> |
igor@333 | 140 <g |
igor@333 | 141 id="g1977" |
igor@333 | 142 transform="translate(81.99999,-0.35715)"> |
igor@333 | 143 <g |
igor@333 | 144 transform="translate(83.57141,-139.3571)" |
igor@333 | 145 id="g1932"> |
igor@333 | 146 <path |
igor@333 | 147 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
igor@333 | 148 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " |
igor@333 | 149 id="path1934" |
igor@333 | 150 sodipodi:nodetypes="cccccc" /> |
igor@333 | 151 <path |
igor@333 | 152 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
igor@333 | 153 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" |
igor@333 | 154 id="path1936" |
igor@333 | 155 sodipodi:nodetypes="cccc" /> |
igor@333 | 156 </g> |
igor@333 | 157 <flowRoot |
igor@333 | 158 transform="translate(83.57141,-139.3571)" |
igor@333 | 159 style="font-size:8px;font-family:Times New Roman" |
igor@333 | 160 id="flowRoot1938" |
igor@333 | 161 xml:space="preserve"><flowRegion |
igor@333 | 162 id="flowRegion1940"><rect |
igor@333 | 163 style="font-size:8px;font-family:Times New Roman" |
igor@333 | 164 y="464.50504" |
igor@333 | 165 x="122.85714" |
igor@333 | 166 height="93.571426" |
igor@333 | 167 width="76.428574" |
igor@333 | 168 id="rect1942" /></flowRegion><flowPara |
igor@333 | 169 id="flowPara1944">Saludos!</flowPara><flowPara |
igor@333 | 170 id="flowPara1946" /><flowPara |
igor@333 | 171 id="flowPara1948">Soy <flowSpan |
igor@333 | 172 style="font-style:italic;fill:#ff0000" |
igor@333 | 173 id="flowSpan3096">Alhaji Abba Abacha, hijo del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot> </g> |
igor@333 | 174 <path |
igor@333 | 175 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" |
igor@333 | 176 d="M 215.502,457.71933 L 196.35507,424.5765" |
igor@333 | 177 id="path1999" |
igor@333 | 178 inkscape:connector-type="polyline" |
igor@333 | 179 inkscape:connection-start="#g1988" |
igor@333 | 180 inkscape:connection-end="#g1966" /> |
igor@333 | 181 <path |
igor@333 | 182 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" |
igor@333 | 183 d="M 277.06936,457.71933 L 296.21629,424.5765" |
igor@333 | 184 id="path2001" |
igor@333 | 185 inkscape:connector-type="polyline" |
igor@333 | 186 inkscape:connection-start="#g1988" |
igor@333 | 187 inkscape:connection-end="#g1977" /> |
igor@333 | 188 <text |
igor@333 | 189 xml:space="preserve" |
igor@333 | 190 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" |
igor@333 | 191 x="302.42859" |
igor@333 | 192 y="515.08905" |
igor@333 | 193 id="text1905"><tspan |
igor@333 | 194 sodipodi:role="line" |
igor@333 | 195 id="tspan1907" |
igor@333 | 196 x="302.42859" |
igor@333 | 197 y="515.08905">VersiĆ³n inicial</tspan></text> |
igor@333 | 198 <text |
igor@333 | 199 xml:space="preserve" |
igor@333 | 200 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" |
igor@333 | 201 x="30.57143" |
igor@333 | 202 y="374.1619" |
igor@333 | 203 id="text1917"><tspan |
igor@333 | 204 sodipodi:role="line" |
igor@333 | 205 id="tspan1919" |
igor@333 | 206 x="30.57143" |
igor@333 | 207 y="374.1619">Nuestros cambios</tspan></text> |
igor@333 | 208 <text |
igor@333 | 209 xml:space="preserve" |
igor@333 | 210 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" |
igor@333 | 211 x="385.71429" |
igor@333 | 212 y="374.1619" |
igor@333 | 213 id="text1921"><tspan |
igor@333 | 214 sodipodi:role="line" |
igor@333 | 215 id="tspan1923" |
igor@333 | 216 x="385.71429" |
igor@333 | 217 y="374.1619">Sus cambios</tspan></text> |
igor@333 | 218 </g> |
igor@333 | 219 </svg> |