Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 01:04:19 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
11,692 Commits 883 Branches 164 Tags
cb99467cdeaffc783c9df8fd286a6a6ca2b2df34
Commit Graph

3 Commits

Author SHA1 Message Date
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
Thomas Gubler b376316fb1 Merge remote-tracking branch 'upstream/isvtol' into dev_ros 
Conflicts:
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
 2014-12-25 09:59:58 +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