1
0
Fork 0

Merge /u/tikibar/flightgear/ branch next into next

https://sourceforge.net/p/flightgear/fgdata/merge-requests/70/
This commit is contained in:
James Turner 2016-08-04 09:54:06 +00:00
commit 8d1e42e93f

View file

@ -1061,31 +1061,43 @@
d="m 521.984,441.616 -19.987,-0.01 0.01,245.247 19.987,0.01 -0.01,-245.246 z"
id="locPtr2"
inkscape:connector-curvature="0"
inkscape:label="#locPtr" /><circle
inkscape:label="#locPtr" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,437.361,-328.129)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path3951"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
cx="380.07"
cy="643.93"
r="6.71751" /><circle
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path3953"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,512.923,-328.129)"
cx="380.07"
cy="643.93"
r="6.71751" /><circle
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,512.923,-328.129)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,663.814,-328.129)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path3955"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
cx="380.07"
cy="643.93"
r="6.71751" /><circle
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path3959"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,739.667,-328.128)"
cx="380.07"
cy="643.93"
r="6.71751" /></g><g
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,739.667,-328.128)" /></g><g
style="display:inline"
id="compassApp"
inkscape:label="#g3124"
@ -1367,32 +1379,44 @@
<g
id="gsGroup"
transform="matrix(0,-1,1,0,746.592,1646.26)"
inkscape:label="#g4160"><circle
style="display:inline;fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:label="#g4160"><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
id="path3951-5"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1048.27,-640.211)"
cx="380.07"
cy="643.93"
r="6.71751" /><circle
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1048.27,-640.211)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1123.83,-640.211)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path3953-2"
style="display:inline;fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
cx="380.07"
cy="643.93"
r="6.71751" /><circle
style="display:inline;fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
id="path3955-3"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1274.73,-640.211)"
cx="380.07"
cy="643.93"
r="6.71751" /><circle
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1274.73,-640.211)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1350.58,-640.21)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path3959-1"
style="display:inline;fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
cx="380.07"
cy="643.93"
r="6.71751" /><path
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
sodipodi:type="arc" /><path
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 1002.5,521.001 -19.001,0"
id="path4166"
inkscape:connector-curvature="0"

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 127 KiB