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

Merge branch 'ardrone' of https://github.com/PX4/Firmware into ardrone

Browse Source 
Conflicts:
	apps/ardrone_interface/ardrone_motor_control.c
This commit is contained in:
Julian Oes
2012-09-27 13:44:47 +02:00
parent 8b795e7ee4 ec3949bf82
commit a05c4d0504
6 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ardrone_interface/ardrone_interface.c
+1 -1
View File
@@ -1,7 +1,7 @@
/****************************************************************************
*
* Copyright (C) 2012 PX4 Development Team. All rights reserved.
* Author: @author Lorenz Meier <lm@inf.ethz.ch>
* Author: Lorenz Meier <lm@inf.ethz.ch>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions