Merge branch 'fw_autoland_att_tecs_navigator' into bottle_drop_navigator

Conflicts:
	src/modules/navigator/navigator_main.cpp
This commit is contained in:
Julian Oes
2013-12-03 20:50:52 +01:00
8 changed files with 172 additions and 310 deletions
+5
View File
@@ -111,6 +111,11 @@ then
#
commander start
#
# Start the datamanager
#
dataman start
#
# Start the Navigator
#