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
..
Boards	Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS	2013-04-11 14:42:49 +01:00
Common	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
inc	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
posix	Merge branch 'amorale/OP-900_update_freertos_740' into next	2013-04-23 21:57:50 +02:00
STM32F4xx	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
STM32F10x	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
pios_sim_posix.h	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
pios.h	OP-908 added pios_math.h and pios_helper.h to contains all the various math and general macros/constants. Fixed remaining constants still defined as double.	2013-04-09 01:10:41 +02:00