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

..

bin

OP-719: fix +x for openpilotgcs on linux

2013-04-14 14:09:46 +03:00

share

Merge remote-tracking branch 'origin/Bertrand/OP-1303_Add_PathPlan_Alarm_In_SystemHealth' into next

2014-05-06 16:58:17 +02:00

src

Merge branch 'amorale/OP-975_calibration_process_changes' into corvuscorax/OP-1161_magnetometer-alarm

2014-05-08 21:27:01 +02:00

copydata.pro

Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521

2014-04-08 11:31:23 +02:00

openpilotgcs.pri

Merge remote-tracking branch 'origin/fnurgel/OP-1162_linux_deb_packaging_qt5' into next

2014-01-18 14:18:46 +01:00

openpilotgcs.pro

OP-1155 OSX Package: Set QMAKE_MACOSX_DEPLOYMENT_TARGET

2014-01-10 00:44:12 +01:00