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 |
|
Alessio Morale
|
09d2ba1d25
|
OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.
+review OPReview-421
|
2013-04-08 01:10:37 +02:00 |
|
Brian Webb
|
1979e8b57f
|
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
|
2013-03-24 16:57:59 +01:00 |
|
Alessio Morale
|
e06ab7f706
|
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
|
2013-03-23 14:37:19 +01:00 |
|
Stacey Sheldon
|
69a2691bc2
|
rename: move board-specific dirs into flight/targets
Conflicts:
flight/targets/Bootloaders/Revolution/Makefile
flight/targets/CopterControl/Makefile
|
2013-01-28 01:52:44 +02:00 |
|