Merge branch 'master' into fixedwing_l1

2013-09-07 12:24:40 +02:00 · 2013-09-07 12:24:40 +02:00 · b6dd579e0e
parent fb9e98fb59 b599a32c16
commit b6dd579e0e
2 changed files with 0 additions and 2 deletions
--- 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
--- 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