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
..
2012-05-28 19:06:25 +03:00
2012-05-05 09:40:44 -07:00
2013-03-24 13:03:53 +02:00
2013-04-08 01:10:37 +02:00
2013-03-24 13:05:58 +02:00
2013-03-24 13:03:53 +02:00
2012-01-23 16:58:07 -06:00
2012-05-22 21:50:53 -04:00
2012-01-14 14:23:18 -05:00
2012-01-14 14:23:18 -05:00
2012-01-14 14:23:18 -05:00
2012-12-11 17:44:03 -07:00
2013-04-18 21:03:25 +02:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:05:51 +02:00
2012-05-05 09:40:44 -07:00
2011-11-19 17:33:04 +02:00
2011-11-04 21:40:34 +02:00
2013-04-05 23:46:56 +03:00
2013-03-24 13:03:53 +02:00
2012-09-16 21:44:09 +02:00
2013-03-24 13:03:53 +02:00
2013-03-27 00:26:47 +01:00
2013-03-31 18:06:52 +02:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:03:53 +02:00
2012-02-02 19:59:42 -07:00
2010-09-27 07:28:45 +00:00
2011-01-28 19:21:22 +00:00
2013-04-18 21:03:25 +02:00
2012-05-05 09:40:44 -07:00
2013-03-24 13:03:53 +02:00
2011-01-10 01:11:44 +00:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2013-04-23 23:14:11 +02:00
2013-03-24 13:03:53 +02:00
2010-09-27 07:28:45 +00:00
2013-03-24 13:03:53 +02:00
2012-09-16 18:19:27 +02:00
2012-01-22 18:22:59 -05:00
2013-04-18 21:03:25 +02:00
2013-03-03 21:45:29 +01:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:03:53 +02:00
2013-04-05 23:46:56 +03:00
2013-04-05 23:46:56 +03:00
2013-03-24 13:03:53 +02:00
2013-01-04 06:50:24 -07:00
2013-01-04 06:50:24 -07:00
2011-07-05 22:03:25 -04:00
2011-08-27 21:39:56 -04:00
2011-07-05 22:03:25 -04:00
2012-01-02 23:33:07 -05:00
2012-09-21 23:51:21 +02:00
2012-12-11 17:43:53 -07:00
2013-04-11 14:42:49 +01:00
2012-12-13 21:07:19 -07:00
2013-04-06 01:32:15 +01:00
2011-07-05 22:03:25 -04:00
2011-07-05 22:03:25 -04:00
2012-08-31 11:01:34 -05:00
2011-10-22 00:44:09 +03:00
2013-03-24 13:03:53 +02:00
2011-08-27 21:39:56 -04:00
2012-08-11 19:46:00 -04:00
2013-03-24 13:03:53 +02:00
2013-04-17 23:40:49 +02:00
2012-05-05 09:40:44 -07:00
2013-03-24 13:03:53 +02:00
2012-05-19 16:06:48 -04:00
2011-08-27 21:39:56 -04:00
2011-08-27 21:39:56 -04:00
2013-03-03 09:50:20 +01:00
2013-04-05 23:46:56 +03:00
2012-01-02 23:33:07 -05:00
2013-03-24 13:03:53 +02:00
2012-01-16 21:32:52 -05:00
2012-05-05 09:40:44 -07:00
2012-09-27 22:42:44 -04:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:03:53 +02:00
2010-09-27 07:28:45 +00:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2013-03-24 13:03:53 +02:00
2012-08-06 11:42:44 -04:00
2013-03-24 13:03:53 +02:00
2012-09-01 19:13:11 -05:00
2012-12-11 17:44:03 -07:00
2012-05-05 09:40:44 -07:00
2013-04-05 23:46:56 +03:00
2013-03-24 13:03:53 +02:00
2013-03-24 13:03:53 +02:00
2013-04-05 23:46:56 +03:00
2013-04-05 23:46:56 +03:00
2010-09-27 07:28:45 +00:00
2012-01-02 14:27:06 -05:00