Sambas f7b9223827 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext ... Conflicts: flight/modules/System/systemmod.c shared/uavobjectdefinition/taskinfo.xml		2013-05-02 09:00:12 +03:00
..
inc	Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next	2013-05-01 15:34:16 +02:00
callbackscheduler.c	Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay	2013-04-27 13:26:03 +02:00
eventdispatcher.c	OP-899: move UAVObjects and UAVTalk one level up from targets	2013-04-24 00:07:07 +03:00
Makefile.inc.template	Rename template files to *.template to screen from uncrustify processing	2013-04-30 16:54:27 +02:00
uavobject.c.template	Rename template files to *.template to screen from uncrustify processing	2013-04-30 16:54:27 +02:00
uavobjectmanager.c	Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext	2013-04-27 13:39:58 +03:00
uavobjectsinit.c.template	Rename template files to *.template to screen from uncrustify processing	2013-04-30 16:54:27 +02:00