Merge fixes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:44 +01:00
committed by Julian Oes
parent 16a7597a16
commit 42baeeb999
2 changed files with 1 additions and 3 deletions
-2
View File
@@ -42,10 +42,8 @@ SRCS = \
px4muorb.cpp \
uORBFastRpcChannel.cpp
endif
=======
SRCS = param/param.c
SRCS += perf_counter.c \
INCLUDE_DIRS += \
${PX4_BASE}/src/modules/uORB