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	OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.	2013-04-08 01:10:37 +02:00
scripts	OP-719: make/scripts/win_sdk_install.sh	2013-04-12 10:56:06 +02:00
templates	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
winx86	tools: Makefile and sh.cmd minor updates (mostly comments)	2013-04-04 23:57:43 +03:00
.gitattributes	OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)	2013-04-05 23:43:58 +03:00
apps-defs.mk	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
boot-defs.mk	Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next	2013-04-23 23:14:11 +02:00
common-defs.mk	make: fix bu_* targets	2013-04-18 17:50:34 +03:00
firmware-defs.mk	Final step: lot of small fixes, last commit in this commit series	2013-03-24 13:06:24 +02:00
tools.mk	tools: fix typo in comments	2013-04-18 16:03:05 +02:00
unittest.mk	ut: change xml output directory to make Bamboo a bit happier	2013-03-03 14:33:04 +01:00