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
..
System	Merge remote-tracking branch 'op-public/next' into revo-next	2012-06-10 19:01:11 -04:00
Makefile	Merge branch 'revo-next' into corvuscorax/new_navigation	2012-05-30 00:51:52 +02:00
Makefile.osx	Reduce the CPU usage of OSX simuluator	2012-05-08 02:29:58 -05:00
UAVObjects.inc	Merge remote-tracking branch 'revo/revo-next' into testing	2012-05-28 09:13:26 -05:00