Alessio Morale ab7af16be3 Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD ... Conflicts: flight/pios/stm32f10x/library.mk flight/targets/boards/revoproto/firmware/pios_board.c		2013-05-19 15:01:08 +02:00
..
libraries	Merge branch 'next' into corvuscorax/OP-944_EKF-improvements	2013-05-16 23:29:15 +02:00
modules	Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next	2013-05-18 15:53:25 +02:00
pios	Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD	2013-05-19 15:01:08 +02:00
Project	Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext	2013-05-02 09:00:12 +03:00
targets	Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD	2013-05-19 15:01:08 +02:00
tests/logfs	Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next	2013-05-18 15:53:25 +02:00
uavobjects	Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next	2013-05-18 15:53:25 +02:00
uavtalk	OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required	2013-05-05 16:32:24 +09:30
.gitattributes	Update flight/.gitattributes to include *.template files	2013-04-30 22:15:58 +02:00