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

This commit is contained in:
Julian Oes
2013-06-13 13:36:54 +02:00
-2
View File
@@ -63,7 +63,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
@@ -79,7 +78,6 @@ MODULES += modules/multirotor_pos_control
#
# Logging
#
MODULES += modules/sdlog
MODULES += modules/sdlog2
#