fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-23 15:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ros

Browse Source 
Conflicts:
	src/platforms/px4_middleware.h
This commit is contained in:
Thomas Gubler
2015-01-15 12:42:28 +01:00
parent e60c1a842c e62bd37e73
commit 96db9e8188
26 changed files with 351 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/examples/fixedwing_control/module.mk
+1 -1
View File
@@ -42,4 +42,4 @@ SRCS = main.c \
MODULE_STACKSIZE = 1200
EXTRACFLAGS = -Wframe-larger-than=1200
EXTRACFLAGS = -Wframe-larger-than=1300