diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-29 19:50:30 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-29 19:50:30 +0100 |
| commit | cf33f2a6277ef807ca30f33b6a9316b4b439e3b5 (patch) | |
| tree | 2495348a2e93bcbb79730314f2c67f17e12d128b /makefiles/config_px4fmu-v1_default.mk | |
| parent | 52960e06c601cacab90a196803e479dce539cd2b (diff) | |
| parent | ebbe4d2235452fd77575bc084bb519987e566ea9 (diff) | |
| download | px4-firmware-cf33f2a6277ef807ca30f33b6a9316b4b439e3b5.tar.gz px4-firmware-cf33f2a6277ef807ca30f33b6a9316b4b439e3b5.tar.bz2 px4-firmware-cf33f2a6277ef807ca30f33b6a9316b4b439e3b5.zip | |
Merge branch 'launchdetection' into navigator_new_fw
Conflicts:
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index f724962b2..2f76d81a4 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -118,6 +118,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps |