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

This commit is contained in:
Thomas Gubler
2015-01-09 08:07:00 +01:00
11 changed files with 150 additions and 33 deletions
+3 -3
View File
@@ -32,9 +32,9 @@ MODULES += drivers/ll40ls
# MODULES += drivers/trone
MODULES += drivers/gps
MODULES += drivers/hil
MODULES += drivers/hott
MODULES += drivers/hott/hott_telemetry
MODULES += drivers/hott/hott_sensors
# MODULES += drivers/hott
# MODULES += drivers/hott/hott_telemetry
# MODULES += drivers/hott/hott_sensors
# MODULES += drivers/blinkm
MODULES += drivers/airspeed
MODULES += drivers/ets_airspeed