diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-05 15:56:49 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-05 15:56:49 +0100 |
| commit | c0285ae815cfe075c6c8bdc09d22a0114ca5cc7e (patch) | |
| tree | f7c6f95ff856c4a7350c3ac37c5a90ef170d4f26 /src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | |
| parent | c96a2eac6d011355367e29f21c0db55922d1d514 (diff) | |
| parent | d3b267c06e53aaf119b66717ac33e78834ea0d69 (diff) | |
| download | px4-firmware-c0285ae815cfe075c6c8bdc09d22a0114ca5cc7e.tar.gz px4-firmware-c0285ae815cfe075c6c8bdc09d22a0114ca5cc7e.tar.bz2 px4-firmware-c0285ae815cfe075c6c8bdc09d22a0114ca5cc7e.zip | |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
Conflicts:
src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
src/modules/fw_att_control/fw_att_control_main.cpp
Diffstat (limited to 'src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp')
0 files changed, 0 insertions, 0 deletions