diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-12 09:34:41 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-12 09:34:41 +0100 |
| commit | b750a588a077c473685ed4115c93907a92867bf1 (patch) | |
| tree | f307650c7875b86fbbf2915fde8cd9ea519a0a00 /ROMFS/Makefile | |
| parent | 163257f3bd4ebe13f6f3eda537793602035baf28 (diff) | |
| parent | ab44a64ca01f35d9f9777d18a01ff9f35996fbf2 (diff) | |
| download | px4-firmware-b750a588a077c473685ed4115c93907a92867bf1.tar.gz px4-firmware-b750a588a077c473685ed4115c93907a92867bf1.tar.bz2 px4-firmware-b750a588a077c473685ed4115c93907a92867bf1.zip | |
Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c
Diffstat (limited to 'ROMFS/Makefile')
| -rw-r--r-- | ROMFS/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ROMFS/Makefile b/ROMFS/Makefile index 3b024de06..d827fa491 100644 --- a/ROMFS/Makefile +++ b/ROMFS/Makefile @@ -23,7 +23,8 @@ ROMFS_FSSPEC := $(SRCROOT)/scripts/rcS~init.d/rcS \ $(SRCROOT)/scripts/rc.PX4IOAR~init.d/rc.PX4IOAR \ $(SRCROOT)/scripts/rc.FMU_quad_x~init.d/rc.FMU_quad_x \ $(SRCROOT)/mixers/FMU_pass.mix~mixers/FMU_pass.mix \ - $(SRCROOT)/mixers/FMU_delta.mix~mixers/FMU_delta.mix \ + $(SRCROOT)/mixers/FMU_Q.mix~mixers/FMU_Q.mix \ + $(SRCROOT)/mixers/FMU_X5.mix~mixers/FMU_X5.mix \ $(SRCROOT)/mixers/FMU_AERT.mix~mixers/FMU_AERT.mix \ $(SRCROOT)/mixers/FMU_AET.mix~mixers/FMU_AET.mix \ $(SRCROOT)/mixers/FMU_RET.mix~mixers/FMU_ERT.mix \ |