Merge branch 'master'

This commit is contained in:
TSC21
2015-05-21 12:26:55 +01:00
parent 1978f1bcac
commit db48df15c8
43 changed files with 481 additions and 749 deletions
-1
View File
@@ -60,7 +60,6 @@
#include <uORB/topics/position_setpoint_triplet.h>
#include <uORB/topics/optical_flow.h>
#include <uORB/topics/actuator_outputs.h>
#include <uORB/topics/actuator_controls_effective.h>
#include <uORB/topics/actuator_controls.h>
#include <uORB/topics/actuator_armed.h>
#include <uORB/topics/manual_control_setpoint.h>