3 Commits

Author	SHA1	Message	Date
Thomas Gubler	dcdde8ea88	Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge ... Conflicts: src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp src/modules/uORB/topics/vehicle_attitude.h	2015-01-21 14:41:03 +01:00
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
Thomas Gubler	9980e44821	moved msg files	2014-12-16 08:22:58 +01:00