Richard Flay (Hyper) ae14c13195 Merge branch 'next' into hyper/OP-951_add--Wshadow-to-flight-CFLAGS ... Conflicts: flight/modules/ManualControl/manualcontrol.c		2013-05-16 06:28:56 +09:30
..
common	Merge branch 'next' into hyper/OP-951_add--Wshadow-to-flight-CFLAGS	2013-05-16 06:28:56 +09:30
inc	OP-950: Adds "higher priority task woken" logic to SPI and SPI bus resident	2013-05-11 16:18:34 +09:30
osx	Move flight/PiOS.osx->flight/pios/osx	2013-04-25 13:23:47 +03:00
posix	OP-931: Makes flight code compile with -Wfloat-equal and -Wunsuffixed-float-constants enabled.	2013-04-30 20:36:42 +09:30
stm32f4xx	Merge branch 'next' into hyper/OP-951_add--Wshadow-to-flight-CFLAGS	2013-05-16 06:28:56 +09:30
stm32f10x	Merge branch 'next' into hyper/OP-951_add--Wshadow-to-flight-CFLAGS	2013-05-16 06:28:56 +09:30
win32	Move flight/PiOS.win32->flight/pios/win32	2013-04-25 13:19:06 +03:00
pios_sim_posix.h	OP-936: Moves the task monitor code out of the flight library and into PiOS.	2013-05-03 07:01:14 +09:30
pios.h	OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,	2013-05-06 19:11:14 +09:30