Merge branch 'master' into test_bottle_drop_paul

Conflicts:
	ROMFS/px4fmu_common/init.d/3035_viper
This commit is contained in:
Julian Oes
2014-08-09 19:59:45 +02:00
5 changed files with 223 additions and 145 deletions
+1 -1
View File
@@ -7,4 +7,4 @@
sh /etc/init.d/rc.fw_defaults
set MIXER FMU_FX79
set MIXER Viper