3djc
70d24506da
Merge branch '2.3' into 2.4
# Conflicts:
# radio/src/fonts/480x272/font_dblsize.png
# radio/src/fonts/480x272/font_xxlsize.png
# radio/src/gui/128x64/model_setup.cpp
# radio/src/gui/128x64/radio_setup.cpp
# radio/src/gui/480x272/model_receiver_options.cpp
# radio/src/gui/480x272/model_setup.cpp
# radio/src/gui/480x272/radio_calibration.cpp
# radio/src/gui/480x272/radio_hardware.cpp
# radio/src/gui/common/stdlcd/draw_functions.cpp
# radio/src/gui/gui_common.cpp
# radio/src/keys.h
# radio/src/lua/interface.cpp
# radio/src/pulses/afhds3.h
# radio/src/rtos.h
# radio/src/switches.cpp
# radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
# radio/src/targets/horus/CMakeLists.txt
# radio/src/targets/horus/lcd_driver.cpp
# radio/src/targets/horus/startup_stm32f42_43xxx.s
# radio/src/targets/taranis/CMakeLists.txt
# radio/src/telemetry/crossfire.h
# radio/src/telemetry/multi.cpp
# radio/src/translations.cpp
# radio/src/translations/it.h.txt
# radio/src/translations/untranslated.h
# radio/util/font2png.py
# tools/commit-tests.sh
2021-04-08 11:42:28 +02:00
..
2016-10-09 10:37:52 +02:00
2016-10-09 10:37:52 +02:00
2021-01-12 17:16:15 +01:00
2021-04-08 11:42:28 +02:00