Fredrik Larson 501441d3fb Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished ...

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

2014-08-16 12:12:15 +10:00

..

openpilotgcs

Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished

2014-08-16 12:12:15 +10:00

uavobject-synthetics

Normalize line endings

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

uavobjgenerator

OP-1291 fix Matlab/Octave converter after UAVTalk changes.

2014-04-05 13:00:55 +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