Mark Charlebois 36f5d47ed9 Merge remote-tracking branch 'upstream/master' into linux ...

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/gyro_calibration.cpp
	src/modules/mavlink/mavlink_ftp.cpp

2015-05-16 15:04:38 -07:00

..

mc_pos_control_main.cpp

Merge remote-tracking branch 'upstream/master' into linux

2015-05-16 15:04:38 -07:00

mc_pos_control_params.c

removed attitude setpoint generation from mc_att_controller and moved to mc_pos_controller

2015-02-07 17:36:21 +01:00

module.mk

MC position controller: Adjust stack size of handler and app

2015-03-08 08:15:45 +01:00