5 Commits

Author	SHA1	Message	Date
Corvus Corax	a0ca66b0cd	Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next	2013-05-01 15:34:16 +02:00
Oleg Semyonov	0394a3511c	Rename template files to *.template to screen from uncrustify processing	2013-04-30 16:54:27 +02:00
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
Richard Flay (Hyper)	fd1181959c	Merge branch 'hyper/OP-913-flight-uavo-alignment' into next	2013-04-27 18:19:01 +09:30
Oleg Semyonov	27195b7327	OP-899: move UAVObjects and UAVTalk one level up from targets	2013-04-24 00:07:07 +03:00