Files
edgetx-gx12/companion/src
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
..
2021-04-08 11:42:28 +02:00
2020-06-22 16:52:52 +02:00
2019-11-07 15:04:45 +01:00
2021-04-08 11:42:28 +02:00
2020-06-22 16:52:52 +02:00
2020-06-22 16:52:52 +02:00
2020-06-22 16:52:52 +02:00
2021-04-08 11:42:28 +02:00
2019-05-10 22:43:01 +02:00
2020-12-05 06:50:43 +11:00
2017-04-24 19:33:06 +02:00
2017-04-24 19:33:06 +02:00
2020-06-14 18:41:37 +02:00
2019-07-13 12:00:52 +02:00
2019-07-13 11:53:40 +02:00
2015-09-26 07:59:04 +02:00
2017-03-20 10:31:39 +01:00
2020-02-06 15:33:32 +01:00
2021-01-12 22:24:09 +01:00
2020-06-22 16:52:52 +02:00
2020-05-04 10:24:36 +02:00
2021-03-16 09:50:00 +11:00
2020-01-30 17:25:09 +04:00
2019-05-16 08:32:56 +02:00
2020-06-22 16:52:52 +02:00
2020-06-22 16:52:52 +02:00
2015-08-11 06:56:02 +02:00
2020-11-19 16:32:50 +01:00
2019-09-10 18:32:04 +02:00
2020-06-22 16:52:52 +02:00