diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-07 12:24:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-07 12:24:40 +0200 |
| commit | b6dd579e0e1bb05d16a4c6f0d4d5c3ec05736db2 (patch) | |
| tree | 7950e721cb96edec37a7ecc18947a3200cc3a87f /src/lib | |
| parent | fb9e98fb59ebe9db572dcdba6396a9c78021b857 (diff) | |
| parent | b599a32c1695d429849d41b398c1b4a586300ee9 (diff) | |
| download | px4-firmware-b6dd579e0e1bb05d16a4c6f0d4d5c3ec05736db2.tar.gz px4-firmware-b6dd579e0e1bb05d16a4c6f0d4d5c3ec05736db2.tar.bz2 px4-firmware-b6dd579e0e1bb05d16a4c6f0d4d5c3ec05736db2.zip | |
Merge branch 'master' 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 |