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

..

uavobjectdefinition

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-05-02 09:00:12 +03:00

.gitattributes

Normalize line endings

2013-04-07 09:49:13 +03:00