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

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

Browse Source 
Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h
This commit is contained in:
Thomas Gubler
2015-01-05 10:02:07 +01:00
parent e16c4ff76e c3ed35f5cc
commit 16b9f666e7
83 changed files with 3468 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -41,3 +41,4 @@ tags
*.orig
src/modules/uORB/topics/*
Firmware.zip
unittests/build