Thomas Gubler 16618f1ada Merge remote-tracking branch 'upstream/master' into dev_ros ...

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

2014-12-18 12:11:05 +01:00

..

std_msgs

initial version of msg to uorb script

2014-12-01 16:39:27 +01:00

templates

moved msg files

2014-12-16 08:22:58 +01:00

actuator_armed.msg

moved msg files

2014-12-16 08:22:58 +01:00

actuator_controls_0.msg

moved msg files

2014-12-16 08:22:58 +01:00

actuator_controls.msg

moved msg files

2014-12-16 08:22:58 +01:00

manual_control_setpoint.msg

moved msg files

2014-12-16 08:22:58 +01:00

parameter_update.msg

moved msg files

2014-12-16 08:22:58 +01:00

rc_channels.msg

moved msg files

2014-12-16 08:22:58 +01:00

vehicle_attitude_setpoint.msg

moved msg files

2014-12-16 08:22:58 +01:00

vehicle_attitude.msg

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

2014-12-18 12:11:05 +01:00

vehicle_control_mode.msg

moved msg files

2014-12-16 08:22:58 +01:00

vehicle_rates_setpoint.msg

moved msg files

2014-12-16 08:22:58 +01:00

vehicle_status.msg

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

2014-12-18 12:11:05 +01:00