Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang

This commit is contained in:
Lorenz Meier
2014-08-26 09:37:56 +02:00
15 changed files with 1034 additions and 25 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
#