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
..
bin	OP-719: fix +x for openpilotgcs on linux	2013-04-14 14:09:46 +03:00
share	Merge remote-tracking branch 'origin/next' into thread/OP-885_Update_Boards_Artwork	2013-04-14 11:30:40 +02:00
src	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
copydata.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
openpilotgcs.pri	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
openpilotgcs.pro	gcs: bump minimum Qt version to 4.8 (4.7 is not supported anymore)	2013-04-16 10:08:53 +02:00