fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 22:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into navigator_rewrite_offboard2_merge

Browse Source 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
This commit is contained in:
Julian Oes
2014-07-02 14:59:43 +02:00
parent 40780e2916 28a31708f9
commit fdceb8b062
52 changed files with 4727 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mavlink/include/mavlink/v1.0/common/common.h
+1 -1
View File
@@ -6,7 +6,7 @@
#define COMMON_H
#ifndef MAVLINK_H
#error Wrong include order: COMMON.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
#error Wrong include order: common.h MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set all defines from mavlink.h manually.
#endif
#ifdef __cplusplus