Sambas f7b9223827 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext ...

Conflicts:
	flight/modules/System/systemmod.c
	shared/uavobjectdefinition/taskinfo.xml

2013-05-02 09:00:12 +03:00

..

bootloader

Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3

2013-04-24 00:37:39 +03:00

firmware

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-05-02 09:00:12 +03:00

board_hw_defs.c

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-25 17:26:49 +03:00

board-info.mk

Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3

2013-04-24 00:37:39 +03:00

pios_board.h

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-25 17:26:49 +03:00

pios_usb_board_data.c

OP-899: remove extra copy of pios_usb_data.c and move it level up

2013-04-24 00:07:06 +03:00