diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-08 00:50:37 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-08 00:50:37 +0200 |
| commit | 14828cfda5f4c81cb8366d5eee4eb1e1cab45370 (patch) | |
| tree | 7950e721cb96edec37a7ecc18947a3200cc3a87f /src/lib | |
| parent | fb9e98fb59ebe9db572dcdba6396a9c78021b857 (diff) | |
| parent | 751c026469f1504e94f46884a641a2838a4015ad (diff) | |
| download | px4-firmware-14828cfda5f4c81cb8366d5eee4eb1e1cab45370.tar.gz px4-firmware-14828cfda5f4c81cb8366d5eee4eb1e1cab45370.tar.bz2 px4-firmware-14828cfda5f4c81cb8366d5eee4eb1e1cab45370.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/mathlib/math/filter/module.mk | 1 | ||||
| -rw-r--r-- | src/lib/mathlib/module.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/mathlib/math/filter/module.mk b/src/lib/mathlib/math/filter/module.mk index fe92c8c70..f5c0647c8 100644 --- a/src/lib/mathlib/math/filter/module.mk +++ b/src/lib/mathlib/math/filter/module.mk @@ -41,4 +41,3 @@ SRCS = LowPassFilter2p.cpp # current makefile name, since app.mk needs it. # APP_MAKEFILE := $(lastword $(MAKEFILE_LIST)) --include $(TOPDIR)/.config diff --git a/src/lib/mathlib/module.mk b/src/lib/mathlib/module.mk index 2146a1413..72bc7db8a 100644 --- a/src/lib/mathlib/module.mk +++ b/src/lib/mathlib/module.mk @@ -49,7 +49,6 @@ SRCS = math/test/test.cpp \ # current makefile name, since app.mk needs it. # APP_MAKEFILE := $(lastword $(MAKEFILE_LIST)) --include $(TOPDIR)/.config ifeq ($(CONFIG_ARCH_CORTEXM4)$(CONFIG_ARCH_FPU),yy) INCLUDE_DIRS += math/arm |