20240217 fix merge conflict OSD 0x0800 #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

nerdCopter merged 1 commit into emuflight:master from nerdCopter:20240217_fix_merge_conflict_OSD_0x0800

Feb 17, 2024

Member

nerdCopter commented Feb 17, 2024 •

edited

Loading

fix merge conflict for Analog OSD VISIBLE_FLAG 0x0800
when merging, brought over x2000 instead of x0800. this fixes analog OSD


          fix merge conflict for Analog OSD VISIBLE_FLAG 0x0800

8387bc6

nerdCopter merged commit ebc98f0 into emuflight:master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet