m_thread 7bcdff9f2f Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard ...

Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h

2014-09-23 22:30:49 +02:00

..

uavobjectdefinition

Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard

2014-09-23 22:30:49 +02:00

.gitattributes

Normalize line endings

2013-04-07 09:49:13 +03:00