Merge fixes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:42 +01:00
committed by Julian Oes
parent da8519b44d
commit 7389ea7648
3 changed files with 1 additions and 8 deletions
-4
View File
@@ -41,11 +41,7 @@ ifeq ($(PX4_TARGET_OS),qurt)
SRCS = \
px4muorb.cpp \
uORBFastRpcChannel.cpp
SRCS = param/param.c
endif
endif
SRCS += perf_counter.c \
INCLUDE_DIRS += \
${PX4_BASE}/src/modules/uORB