diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-18 09:26:49 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-18 09:26:49 +0200 |
| commit | 174b0a552723ab059d442c312267dbb809e0b90a (patch) | |
| tree | 9a3887d4148a74a2483bd1ccb60980b4ca7fb17e /src/modules/mavlink | |
| parent | 1e9d77f1d2dfd3f500c8486edf8940bc4a15162e (diff) | |
| parent | 01f1c90c2673754c10d031796b0dbba5e7a6fd55 (diff) | |
| download | px4-firmware-174b0a552723ab059d442c312267dbb809e0b90a.tar.gz px4-firmware-174b0a552723ab059d442c312267dbb809e0b90a.tar.bz2 px4-firmware-174b0a552723ab059d442c312267dbb809e0b90a.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/mavlink/mavlink_main.cpp
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index d63b08040..a203102ec 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -169,7 +169,6 @@ Mavlink::Mavlink() : _param_component_id(0), _param_system_type(0), _param_use_hil_gps(0), - _param_forward_externalsp(0), /* performance counters */ _loop_perf(perf_alloc(PC_ELAPSED, "mavlink_el")), |