abeck70 143f09d216 Merge remote-tracking branch 'origin/rel-15.02.02' into next ... Conflicts: flight/modules/Actuator/actuator.c		2015-05-06 08:35:21 +10:00
..
openpilotgcs	Merge remote-tracking branch 'origin/rel-15.02.02' into next	2015-05-06 08:35:21 +10:00
uavobject-synthetics	OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template.	2015-03-31 14:57:43 +13:00
uavobjgenerator	uncrustified	2015-05-02 16:46:35 +02:00
.gitattributes	OP-910: fix line endings and whitespaces (didn't work on Linux)	2013-06-05 23:21:54 +03:00
ground.pro	git merge next	2013-12-18 20:14:26 +01:00