Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into mavlink2_hil

This commit is contained in:
Lorenz Meier
2014-03-16 13:50:50 +01:00
11 changed files with 321 additions and 278 deletions
+2 -2
View File
@@ -474,7 +474,7 @@ then
sh /etc/init.d/rc.interface
# Start standard fixedwing apps
if [ LOAD_DEFAULT_APPS == yes ]
if [ $LOAD_DEFAULT_APPS == yes ]
then
sh /etc/init.d/rc.fw_apps
fi
@@ -533,7 +533,7 @@ then
sh /etc/init.d/rc.interface
# Start standard multicopter apps
if [ LOAD_DEFAULT_APPS == yes ]
if [ $LOAD_DEFAULT_APPS == yes ]
then
sh /etc/init.d/rc.mc_apps
fi