Merge remote-tracking branch 'upstream/master' into eagletree

This commit is contained in:
Simon Wilks
2013-04-22 20:54:41 +02:00
59 changed files with 4081 additions and 235 deletions
+1 -1
View File
@@ -97,7 +97,7 @@ ifneq ($(CONFIG_APM),y)
CONFIGURED_APPS += ardrone_interface
CONFIGURED_APPS += multirotor_att_control
CONFIGURED_APPS += multirotor_pos_control
#CONFIGURED_APPS += fixedwing_control
CONFIGURED_APPS += position_estimator_mc
CONFIGURED_APPS += fixedwing_att_control
CONFIGURED_APPS += fixedwing_pos_control
CONFIGURED_APPS += position_estimator