006eee1411cda08a7502ab3d2d7c601790664f99
Conflicts: companion/src/main.cpp
Merge branch 'dvogonen/automatically_convert_settings_511' of https://github.com/opentx/opentx into next
[to be written]
Languages
C
71.9%
C++
25.4%
Python
0.9%
CMake
0.6%
Shell
0.3%
Other
0.7%