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
..
linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07:00
osx	Make packaging on OSX include all pipxtremem compiled opfw in the packaging directory	2012-06-07 12:39:00 -05:00
winx86	Windows installer: add HISTORY.txt and web links to the Start menu	2011-08-04 12:51:05 +03:00
Makefile	Merge remote-tracking branch 'op-public/next' into revo-next	2012-06-10 19:01:11 -04:00
Makefile.linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07:00
Makefile.osx	OSX Packaging: Go back to release configuration for build	2011-08-04 20:54:59 -05:00
Makefile.winx86	package: now it is called 'make package' instead of 'make release'	2011-05-28 03:14:51 +03:00