Thomas Gubler c0285ae815 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
Conflicts:
	src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
	src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
	src/modules/fw_att_control/fw_att_control_main.cpp
2013-11-05 15:56:49 +01:00
..
2013-11-03 18:26:02 +01:00
2013-10-10 21:15:03 +02:00