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

..

coptercontrol

Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD

2013-05-19 15:01:08 +02:00

oplinkmini

Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD

2013-05-19 15:01:08 +02:00

osd

Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD

2013-05-19 15:01:08 +02:00

revolution

Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD

2013-05-19 15:01:08 +02:00

revoproto

Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD

2013-05-19 15:01:08 +02:00

simposix

Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next

2013-05-18 15:53:25 +02:00