Fixing rebase conflicts

This commit is contained in:
Vicente Monge
2017-08-01 22:32:43 +02:00
committed by Lorenz Meier
parent d69c53827f
commit c85039e413
65 changed files with 4091 additions and 8 deletions
+2 -2
View File
@@ -36,8 +36,8 @@ include_directories(${PX4_SOURCE_DIR}/mavlink/include/mavlink)
px4_add_module(
MODULE modules__mavlink
MAIN mavlink
STACK_MAIN 1200
STACK_MAX 1500
STACK_MAIN 2000
STACK_MAX 2500
COMPILE_FLAGS
SRCS
mavlink.c