Fredrik Arvidsson 02c981388a Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09 ... # Conflicts: # flight/targets/boards/coptercontrol/board_hw_defs.c # flight/targets/boards/coptercontrol/firmware/pios_board.c # flight/targets/boards/revolution/board_hw_defs.c # flight/targets/boards/revolution/firmware/inc/pios_config.h # flight/targets/boards/revolution/firmware/pios_board.c # flight/targets/boards/revonano/firmware/inc/pios_config.h # flight/targets/boards/revonano/firmware/pios_board.c # shared/uavobjectdefinition/hwsettings.xml # shared/uavobjectdefinition/manualcontrolsettings.xml # shared/uavobjectdefinition/receiveractivity.xml		2016-01-09 16:59:24 +01:00
..
src	Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09	2016-01-09 16:59:24 +01:00
copydata.pro	Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration	2015-08-29 17:03:48 +02:00
gcs.pri	Moved question mark to code & added missing define	2015-09-18 06:54:50 +01:00
gcs.pro	LP-1: moved openpilotgcs.pri to gcs.pri	2015-08-02 19:36:39 +01:00