aboutsummaryrefslogtreecommitdiff
path: root/ROMFS/px4fmu_common/mixers
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-04-20 02:04:05 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-04-20 02:04:05 +0200
commit2ea32b315fb06f13813950a8ef385dd521694278 (patch)
tree2ea9711c8a3f18244685a6a356bfc43b3836730b /ROMFS/px4fmu_common/mixers
parenteb9daf097e10f434e729581b3ffce6c1b322b927 (diff)
parent0b85c41cd19486e829d48cf9e604fbc25b9e52a6 (diff)
downloadpx4-firmware-2ea32b315fb06f13813950a8ef385dd521694278.tar.gz
px4-firmware-2ea32b315fb06f13813950a8ef385dd521694278.tar.bz2
px4-firmware-2ea32b315fb06f13813950a8ef385dd521694278.zip
Merged master
Diffstat (limited to 'ROMFS/px4fmu_common/mixers')
-rw-r--r--ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix (renamed from ROMFS/px4fmu_common/mixers/hexa_cox.mix)0
1 files changed, 0 insertions, 0 deletions
diff --git a/ROMFS/px4fmu_common/mixers/hexa_cox.mix b/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix
index 497786feb..497786feb 100644
--- a/ROMFS/px4fmu_common/mixers/hexa_cox.mix
+++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix