Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator_termination_controlgroups

Conflicts:
	src/modules/navigator/navigator_main.cpp
This commit is contained in:
Thomas Gubler
2013-12-23 11:47:17 +01:00
11 changed files with 1037 additions and 684 deletions

View File

@@ -113,6 +113,11 @@ then
#
commander start
#
# Start the datamanager
#
dataman start
#
# Start the Navigator
#