diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-13 15:05:56 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-13 15:05:56 +0100 |
| commit | 58d69052e205bee091c92cf8fcca8dcfdec25f85 (patch) | |
| tree | a7272d74ca573ed8f75f732b0b922e068267b407 /ROMFS/px4fmu_common/init.d | |
| parent | 1b47f05b1409f5006f288458b5b176a855174e7f (diff) | |
| parent | 4bb07514c86d020bc2b16058e75de3074f89aa4b (diff) | |
| download | px4-firmware-58d69052e205bee091c92cf8fcca8dcfdec25f85.tar.gz px4-firmware-58d69052e205bee091c92cf8fcca8dcfdec25f85.tar.bz2 px4-firmware-58d69052e205bee091c92cf8fcca8dcfdec25f85.zip | |
Merge remote-tracking branch 'upstream/master' into romfs_clean
Conflicts:
ROMFS/px4fmu_common/init.d/rc.interface
ROMFS/px4fmu_common/init.d/rcS
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/2102_3dr_skywalker | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/2102_3dr_skywalker b/ROMFS/px4fmu_common/init.d/2102_3dr_skywalker index dcc5db824..906f4b1cc 100644 --- a/ROMFS/px4fmu_common/init.d/2102_3dr_skywalker +++ b/ROMFS/px4fmu_common/init.d/2102_3dr_skywalker @@ -2,4 +2,4 @@ sh /etc/init.d/rc.fw_defaults -set MIXER FMU_AERT
\ No newline at end of file +set MIXER skywalker
\ No newline at end of file |