diff options
| author | Julian Oes <julian@oes.ch> | 2014-08-09 19:59:45 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-08-09 19:59:45 +0200 |
| commit | 6ff32b2338dd85c74597438f6f67f7975e172d19 (patch) | |
| tree | 1b9f880081763551aa388b9af440b79801ccaf63 /ROMFS/px4fmu_common/init.d | |
| parent | b0b2f349923570a92c0611142f3cbcfa10d48b18 (diff) | |
| parent | 64ed25359135bd19b40b36d2562ba442c36dab51 (diff) | |
| download | px4-firmware-6ff32b2338dd85c74597438f6f67f7975e172d19.tar.gz px4-firmware-6ff32b2338dd85c74597438f6f67f7975e172d19.tar.bz2 px4-firmware-6ff32b2338dd85c74597438f6f67f7975e172d19.zip | |
Merge branch 'master' into test_bottle_drop_paul
Conflicts:
ROMFS/px4fmu_common/init.d/3035_viper
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/3035_viper | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/3035_viper b/ROMFS/px4fmu_common/init.d/3035_viper index 9c8f8a585..a4c1e832d 100644 --- a/ROMFS/px4fmu_common/init.d/3035_viper +++ b/ROMFS/px4fmu_common/init.d/3035_viper @@ -7,4 +7,4 @@ sh /etc/init.d/rc.fw_defaults -set MIXER FMU_FX79
\ No newline at end of file +set MIXER Viper |