Julian Oes 40f2d581bf Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator ...

Conflicts:
	src/drivers/px4fmu/fmu.cpp
	src/modules/dataman/dataman.c
	src/modules/dataman/dataman.h
	src/modules/mavlink/orb_listener.c
	src/modules/mavlink/waypoints.c
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_mission.cpp
	src/modules/navigator/navigator_mission.h
	src/modules/uORB/topics/mission.h

2013-12-27 00:04:32 +01:00

..

px4fmu_common

Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator

2013-12-27 00:04:32 +01:00

px4fmu_logging

Added missing folder

2013-12-21 18:58:28 +01:00

px4fmu_test/init.d

Useful bits for high-rate logging

2013-12-20 14:25:35 +01:00