aboutsummaryrefslogtreecommitdiff
path: root/msg/vehicle_status.msg
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2015-01-051-0/+1
| | | | | | | | 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
* Merge remote-tracking branch 'upstream/isvtol' into dev_rosThomas Gubler2014-12-251-1/+2
| | | | | | Conflicts: src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_status.h
* Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-181-0/+157
Conflicts: src/examples/subscriber/subscriber_params.c src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_attitude.h src/modules/uORB/topics/vehicle_attitude_setpoint.h src/platforms/px4_middleware.h