fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 01:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	makefiles/firmware.mk
	src/modules/commander/module.mk
	src/modules/mavlink/mavlink_ftp.h
	src/modules/mavlink/mavlink_tests/module.mk
This commit is contained in:
Mark Charlebois
2015-05-04 16:36:59 -07:00
parent ed621a6a8d 577bdf3a0d
commit 12a25e4b63
24 changed files with 916 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/ros/perf_counter.cpp
+1 -3
View File
@@ -170,7 +170,5 @@ void perf_reset_all(void)
*/
uint64_t perf_event_count(perf_counter_t handle)
{
return 0;
}