Public Git Hosting - inav.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: aa1f6c2 d5b7a2c)

commit	896f2da5bf0984cc3bb0eacf14823d2ab38e9c94
author	breadoven <56191411+breadoven@users.noreply.github.com>
	Sun, 7 Nov 2021 16:40:19 +0000 (7 16:40 +0000)
committer	breadoven <56191411+breadoven@users.noreply.github.com>
	Sun, 7 Nov 2021 16:40:19 +0000 (7 16:40 +0000)
tree	1814394185bf86277cf0cd01cdb5900fdfffa940	tree \| snapshot (tar.gz zip)
parent	aa1f6c2be777cb900f0c0ed6fa421bf7da66613f	commit \| diff
parent	d5b7a2ce8d98d1556a24db27e55d122d657a6166	commit \| diff

Merge remote-tracking branch 'upstream/master' into abo_fixed_wing_soaring_mode

docs/Settings.md	diff1 \|	diff2 \|	blob \| history
src/main/fc/fc_msp_box.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/rc_modes.h	diff1 \|	diff2 \|	blob \| history
src/main/fc/settings.yaml	diff1 \|	diff2 \|	blob \| history
src/main/io/osd.c	diff1 \|	diff2 \|	blob \| history
src/main/io/osd.h	diff1 \|	diff2 \|	blob \| history
src/main/navigation/navigation.c	diff1 \|	diff2 \|	blob \| history
src/main/navigation/navigation.h	diff1 \|	diff2 \|	blob \| history

INAV: Navigation-enabled flight control software