Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros ...

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

2015-01-05 10:02:07 +01:00

7.5 KiB

Raw Blame History

View Raw