Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe

This commit is contained in:
Thomas Gubler
2014-09-04 20:28:25 +02:00
11 changed files with 1102 additions and 12 deletions
+5
View File
@@ -128,6 +128,11 @@ MODULES += lib/geo_lookup
MODULES += lib/conversion
MODULES += lib/launchdetection
#
# OBC challenge
#
MODULES += modules/bottle_drop
#
# Demo apps
#