Merge branch 'master' into export-build

This commit is contained in:
px4dev
2013-04-26 11:27:26 -07:00
70 changed files with 4535 additions and 280 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