tnaegeli ec018e7b64 Merge branch 'master' of https://github.com/PX4/Firmware ...

Conflicts:
	apps/commander/state_machine_helper.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
solved

2012-10-10 09:52:37 +02:00

..

logging

Minor tweaks to ROMFS scripts/ logging

2012-09-14 18:59:45 +02:00

mixers

Roll/pitch values into the mixer are already scaled appropriately; don't factor them down any further.

2012-09-02 14:19:50 -07:00

scripts

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

2012-10-10 09:52:37 +02:00

.gitignore

…

Makefile

Minor tweaks to ROMFS scripts/ logging

2012-09-14 18:59:45 +02:00