rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

some revision control data is misplaced preventing compile

Browse Source
This commit is contained in:
Kevin Finisterre 2014-06-11 12:23:33 -04:00
parent 7558509720
commit b9733363b3
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
View File

@ -1100,11 +1100,7 @@
id="path8516_1_" id="path8516_1_"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:none;stroke:#010101;stroke-width:0.69520003;stroke-linecap:round;stroke-linejoin:round" /></g></g></g><g style="fill:none;stroke:#010101;stroke-width:0.69520003;stroke-linecap:round;stroke-linejoin:round" /></g></g></g><g
<<<<<<< HEAD
id="elevon" id="elevon"
=======
id="v-tail"
>>>>>>> parent of 11fa414... Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties.
transform="matrix(0.8,0,0,0.8,78.355285,170.6871)"><path transform="matrix(0.8,0,0,0.8,78.355285,170.6871)"><path
style="stroke:#000000;stroke-width:0.75538152;stroke-miterlimit:10" style="stroke:#000000;stroke-width:0.75538152;stroke-miterlimit:10"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 95 KiB

5
ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
View File

@ -105,13 +105,8 @@ void FixedWingPage::updateImageAndDescription()
case SetupWizard::FIXED_WING_AILERON: case SetupWizard::FIXED_WING_AILERON:
elementId = "aileron"; elementId = "aileron";
break; break;
<<<<<<< HEAD
case SetupWizard::FIXED_WING_ELEVON: case SetupWizard::FIXED_WING_ELEVON:
elementId = "elevon"; elementId = "elevon";
=======
case SetupWizard::FIXED_WING_VTAIL:
elementId = "v-tail";
>>>>>>> parent of 11fa414... Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties.
break; break;
default: default:
elementId = ""; elementId = "";