2 Commits

Author	SHA1	Message	Date
Richard Flay (Hyper)	fbc8bc698f	OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts, ... and brings the callback scheduler into the fold. +review OPReview-461	2013-05-06 19:11:14 +09:30
Corvus Corax	e1233c7780	Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay ... Conflicts: flight/targets/Revolution/System/inc/openpilot.h flight/targets/SimPosix/System/inc/openpilot.h flight/targets/boards/coptercontrol/firmware/inc/openpilot.h flight/targets/boards/oplinkmini/firmware/inc/openpilot.h flight/targets/boards/revolution/firmware/inc/openpilot.h flight/targets/boards/revoproto/firmware/inc/openpilot.h	2013-04-27 13:26:03 +02:00