Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup

This commit is contained in:
Lorenz Meier
2013-06-13 19:51:52 +02:00
-2
View File
@@ -64,7 +64,6 @@ MODULES += modules/gpio_led
#
MODULES += modules/attitude_estimator_ekf
MODULES += modules/attitude_estimator_so3_comp
#MODULES += modules/position_estimator_mc
MODULES += modules/position_estimator
MODULES += modules/att_pos_estimator_ekf
@@ -80,7 +79,6 @@ MODULES += modules/multirotor_pos_control
#
# Logging
#
MODULES += modules/sdlog
MODULES += modules/sdlog2
#