tumbili 0a0a074194 use virtual attitude setpoint ...

Conflicts:
	src/modules/vtol_att_control/tailsitter.cpp
	src/modules/vtol_att_control/tiltrotor.cpp
	src/modules/vtol_att_control/vtol_att_control_main.cpp
	src/modules/vtol_att_control/vtol_att_control_main.h
	src/modules/vtol_att_control/vtol_type.h

2015-11-25 13:28:22 +01:00

1.0 KiB

Raw Blame History

View Raw