Alessio Morale 57ca1639cc Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next ...

Conflicts:
	flight/Libraries/op_dfu.c
	flight/PiOS/STM32F10x/pios_iap.c
	flight/PiOS/inc/pios_iap.h
	flight/targets/BootloaderUpdater/main.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/CopterControl/op_dfu.c
	flight/targets/Bootloaders/OSD/inc/op_dfu.h
	flight/targets/Bootloaders/PipXtreme/op_dfu.c
	flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
	flight/targets/Bootloaders/RevoMini/op_dfu.c
	flight/targets/Bootloaders/Revolution/inc/op_dfu.h
	flight/targets/Bootloaders/Revolution/op_dfu.c
	ground/openpilotgcs/src/plugins/uploader/uploader.ui
	make/apps-defs.mk
	make/boot-defs.mk

2013-04-23 23:14:11 +02:00

..

board_hw_defs

Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS

2013-04-01 14:30:46 +01:00

Bootloaders

Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next

2013-04-23 23:14:11 +02:00

BootloaderUpdater

Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next

2013-04-23 23:14:11 +02:00

CopterControl

Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next

2013-04-23 23:14:11 +02:00

EntireFlash

OP-719: make python_install (Windows)

2013-04-12 10:56:10 +02:00

OSD

Merge branch 'amorale/OP-900_update_freertos_740' into next

2013-04-23 21:57:50 +02:00

PipXtreme

Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next

2013-04-23 23:14:11 +02:00

Revolution

Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next

2013-04-23 23:14:11 +02:00

RevoMini

Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next

2013-04-23 23:14:11 +02:00

SimPosix

Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks

2013-04-19 23:43:42 +02:00

UAVObjects

OP-772: Normalize line endings

2013-04-05 23:46:56 +03:00

UAVTalk

Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next

2013-03-23 14:37:19 +01:00