tnaegeli ec018e7b64 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/commander/state_machine_helper.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
solved
2012-10-10 09:52:37 +02:00
..