1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/ground
Laurent Lalanne bc9e6b24f9 Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg

Conflicts resolved in artwork, same style as FW branch
2014-09-16 18:55:43 +02:00
..
openpilotgcs Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard 2014-09-16 18:55:43 +02:00
uavobject-synthetics Normalize line endings 2013-04-07 09:49:13 +03:00
uavobjgenerator OP-1456 get rid of cast_struct_to_array because it is error prone! 2014-08-24 00:16:34 +02:00
.gitattributes OP-910: fix line endings and whitespaces (didn't work on Linux) 2013-06-05 23:21:54 +03:00
ground.pro git merge next 2013-12-18 20:14:26 +01:00