Julian Oes fd56c15a20 Merge remote-tracking branch 'px4/master' into navigator_cleanup ...

Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_messages.cpp
	src/modules/mavlink/module.mk
	src/modules/sdlog2/sdlog2_messages.h

2014-04-22 11:10:48 +02:00

..

drivers

Merged master

2014-04-20 02:04:05 +02:00

examples

Merged beta into mavlink rework branch

2014-01-28 15:13:14 +01:00

include

Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2

2014-03-21 10:47:36 +01:00

lib

airspeed: Prevent the filter from overshooting into the negative airspeed range

2014-04-05 17:02:37 +02:00

modules

Merge remote-tracking branch 'px4/master' into navigator_cleanup

2014-04-22 11:10:48 +02:00

systemcmds

Consistently making space for a maximum of 12 channels, 10 channels (including reference / temperature) are used / available right now

2014-03-17 17:02:10 +01:00

mainpage.dox

Merged beta into mavlink rework branch

2014-01-28 15:13:14 +01:00