Thomas Gubler f4e0dc2857 Merge remote-tracking branch 'upstream/master' into dev_ros ...

Conflicts:
	.gitmodules

2014-12-29 08:00:12 +01:00

..

mtecs

fix order of arguments (merge fix)

2014-11-25 15:56:05 +01:00

fw_pos_control_l1_main.cpp

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

2014-12-25 09:48:15 +01:00

fw_pos_control_l1_params.c

fw pos control: add param to enable/disable usage of terrain estimate during landing

2014-09-23 09:37:28 +02:00

landingslope.cpp

Fix compiler warnings

2014-06-29 17:47:24 -07:00

landingslope.h

Fix compiler warnings

2014-06-29 17:47:24 -07:00

module.mk

turn on -Werror and fix resulting errors

2014-12-22 17:56:59 -05:00