diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-21 20:43:32 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-21 20:43:32 +0200 |
| commit | 05de7fb7a08a4786b12ab3c9eeda040f70b01228 (patch) | |
| tree | 0a54c1d767e9f7764508a4e5449bae7fa943ba38 /ROMFS | |
| parent | 9a35bac2adc1e803dea7cdb6a2db277f111724e0 (diff) | |
| parent | 9ea0b2189992830f2698c7d4703ff472072a61b1 (diff) | |
| download | px4-firmware-05de7fb7a08a4786b12ab3c9eeda040f70b01228.tar.gz px4-firmware-05de7fb7a08a4786b12ab3c9eeda040f70b01228.tar.bz2 px4-firmware-05de7fb7a08a4786b12ab3c9eeda040f70b01228.zip | |
Merge remote-tracking branch 'upstream/master' into fwattrobustify
Conflicts:
src/modules/fw_att_control/fw_att_control_main.cpp
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/11001_hexa_cox | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/11001_hexa_cox b/ROMFS/px4fmu_common/init.d/11001_hexa_cox index df2e609bc..daa04a4de 100644 --- a/ROMFS/px4fmu_common/init.d/11001_hexa_cox +++ b/ROMFS/px4fmu_common/init.d/11001_hexa_cox @@ -1,7 +1,5 @@ #!nsh # -# UNTESTED UNTESTED! -# # Generic 10" Hexa coaxial geometry # # Lorenz Meier <lm@inf.ethz.ch> |