Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator

Conflicts:
	src/modules/mavlink/missionlib.c
	src/systemcmds/tests/module.mk
This commit is contained in:
Thomas Gubler
2013-12-05 10:53:41 +01:00
27 changed files with 1024 additions and 326 deletions
+6
View File
@@ -318,6 +318,12 @@ then
sh /etc/init.d/101_hk_bixler
set MODE custom
fi
if param compare SYS_AUTOSTART 102
then
sh /etc/init.d/102_3dr_skywalker
set MODE custom
fi
# Start any custom extensions that might be missing
if [ -f /fs/microsd/etc/rc.local ]