Merge master into cmake-2

This commit is contained in:
Lorenz Meier
2015-10-03 15:34:30 +02:00
10 changed files with 121 additions and 25 deletions
+5 -5
View File
@@ -365,11 +365,6 @@ then
then
fi
#
# UAVCAN
#
sh /etc/init.d/rc.uavcan
#
# Sensors System (start before Commander so Preflight checks are properly run)
#
@@ -576,6 +571,11 @@ then
fi
fi
#
# UAVCAN
#
sh /etc/init.d/rc.uavcan
#
# Logging
#