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
..
inc	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
coptercontrol.c	Revert "OP-1810 FOC"	2015-07-15 00:07:50 +02:00
Makefile	LP-99 Decouple flight build	2015-09-02 19:34:58 +12:00
pios_board_posix.c	Revert "OP-1810 FOC"	2015-07-15 00:07:50 +02:00
pios_board.c	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