Thomas Gubler 7f9a231b40 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages ...

Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp

2014-10-05 13:17:32 +02:00

..

mc_pos_control_main.cpp

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

2014-10-05 13:17:32 +02:00

mc_pos_control_params.c

mc_pos_control: Code style fixes in comments

2014-05-15 07:28:18 +02:00

module.mk

Copyright and comments fixes

2014-01-19 13:11:15 +01:00