Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip

This commit is contained in:
Julian Oes
2013-11-18 13:00:09 +01:00
15 changed files with 1470 additions and 59 deletions
+1
View File
@@ -105,6 +105,7 @@ MODULES += modules/systemlib
MODULES += modules/systemlib/mixer
MODULES += modules/controllib
MODULES += modules/uORB
MODULES += modules/dataman
#
# Libraries
+1
View File
@@ -102,6 +102,7 @@ MODULES += modules/systemlib
MODULES += modules/systemlib/mixer
MODULES += modules/controllib
MODULES += modules/uORB
MODULES += modules/dataman
#
# Libraries