Thomas Gubler 5aea635a89 Merge remote-tracking branch 'upstream/master' into mtecs ...

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp

2014-05-13 21:25:08 +02:00

..

drivers

HoTT driver: Add timestamp, rename function-level variable from _esc to esc to match conventions

2014-05-13 08:38:07 +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

Merge pull request #876 from PX4/autodeclination

2014-05-03 03:41:30 -07:00

modules

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

2014-05-13 21:25:08 +02:00

systemcmds

Fix a param save issue where a state variable might preven the parameters from being saved (identified and fixed by ultrasystem)

2014-05-08 20:21:02 +02:00

mainpage.dox

Merged beta into mavlink rework branch

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