1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
LibrePilot/shared
m_thread daae74f9e8 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
2014-09-21 22:58:15 +02:00
..
uavobjectdefinition Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 2014-09-21 22:58:15 +02:00
.gitattributes Normalize line endings 2013-04-07 09:49:13 +03:00