Stacey Sheldon c73cffce59 Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: Makefile flight/PiOS/Boards/STM32F4xx_Revolution.h flight/Revolution/System/inc/pios_config.h package/Makefile Fixed CRLF line end clobbering in: flight/Bootloaders/Revolution/inc/pios_config.h flight/Modules/OveroSync/inc/overosync.h flight/Modules/Sensors/inc/sensors.h flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/Common/pios_usb_util.c flight/PiOS/STM32F4xx/pios_iap.c flight/PiOS/inc/pios_rfm22b_priv.h flight/PiOS/inc/pios_usb_util.h		2012-06-10 19:01:11 -04:00
..
BootloaderUpdater	Revert "bu: remove LED support from bootloader updaters"	2012-05-23 00:46:19 -04:00
CopterControl	cc: use defines for board revisions instead of hard-coded numbers	2012-05-23 00:29:12 -04:00
OSD	Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1	2012-05-28 19:06:25 +03:00
PipXtreme	Updated PipX bootloader USB configuration to match CC.	2012-05-24 18:06:19 -07:00
Revolution	Merge branch 'next' into MikeL	2012-06-04 15:38:57 -07:00