Public Git Hosting - ExpressLRS.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: ed5fc60 beff021)

commit	ac269dc8366ec604ac25ca9fdf7a4565cca5fa1a
author	Paul Kendall <pkendall64@gmail.com>
	Thu, 23 Dec 2021 03:16:02 +0000 (23 16:16 +1300)
committer	Paul Kendall <pkendall64@gmail.com>
	Thu, 23 Dec 2021 03:16:02 +0000 (23 16:16 +1300)
tree	dc9049564342b864c07cb92a3ef93da52fcd3e21	tree \| snapshot (tar.gz zip)
parent	ed5fc600405a2c2654222b29b1838ab731921eee	commit \| diff
parent	beff021f28fa262bd1e836d81ebe026c232c5c26	commit \| diff

Merge branch '2.0.x-maintenance' into master-merge-commit

# Conflicts:
# src/lib/SX127xDriver/SX127x.cpp
# src/lib/SX127xDriver/SX127xRegs.h

12 files changed:

src/include/target/BETAFPV_2400_TX_MICRO.h	diff1 \|	diff2 \|	blob \| history
src/include/target/BETAFPV_900_TX.h	diff1 \|	diff2 \|	blob \| history
src/include/target/BETAFPV_900_TX_MICRO.h	diff1 \|	diff2 \|	blob \| history
src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h	diff1 \|	diff2 \|	blob \| history
src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h	diff1 \|	diff2 \|	blob \| history
src/include/target/NamimnoRC_VOYAGER_900_OLED_TX.h	diff1 \|	diff2 \|	blob \| history
src/lib/SX127xDriver/SX127xRegs.h	diff1 \|	diff2 \|	blob \| history
src/python/build_flags.py	diff1 \|	diff2 \|	blob \| history
src/python/build_html.py	diff1 \|	diff2 \|	blob \| history
src/src/options.cpp	diff1 \|	diff2 \|	blob \| history
src/targets/diy_2400.ini	diff1 \|	diff2 \|	blob \| history
src/targets/diy_900.ini	diff1 \|	diff2 \|	blob \| history