1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
LibrePilot/shared
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
..
uavobjectdefinition 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
.gitattributes Normalize line endings 2013-04-07 09:49:13 +03:00