Corvus Corax 29cef5876d Merge branch 'amorale/OP-975_calibration_process_changes' into corvuscorax/OP-1161_magnetometer-alarm ... Conflicts: ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp		2014-05-08 21:27:01 +02:00
..
openpilotgcs	Merge branch 'amorale/OP-975_calibration_process_changes' into corvuscorax/OP-1161_magnetometer-alarm	2014-05-08 21:27:01 +02: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