Mark Charlebois 36f5d47ed9 Merge remote-tracking branch 'upstream/master' into linux ...

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/gyro_calibration.cpp
	src/modules/mavlink/mavlink_ftp.cpp

2015-05-16 15:04:38 -07:00

..

mixer_group.cpp

Use px4_config.h instead of nuttx/config.h

2015-04-20 10:55:41 -07:00

mixer_load.c

Use px4_config.h instead of nuttx/config.h

2015-04-20 10:55:41 -07:00

mixer_load.h

Use px4_config.h instead of nuttx/config.h

2015-04-20 10:55:41 -07:00

mixer_multirotor.cpp

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

2015-05-16 15:04:38 -07:00

mixer_simple.cpp

Use px4_config.h instead of nuttx/config.h

2015-04-20 10:55:41 -07:00

mixer.cpp

Use px4_config.h instead of nuttx/config.h

2015-04-20 10:55:41 -07:00

mixer.h

Use px4_config.h instead of nuttx/config.h

2015-04-20 10:55:41 -07:00

module.mk

Fixed compilation

2015-01-05 13:22:53 +02:00

multi_tables.mk

remove output of multi_tables script

2015-01-06 10:29:36 +01:00

multi_tables.py

tricopter initial commit

2015-02-05 20:18:00 -08:00