Skip to content

Hello, could you please update the binaries? - #132

Open
Lusitanv wants to merge 67 commits into
ttrftech:masterfrom
reald:master
Open

Hello, could you please update the binaries?#132
Lusitanv wants to merge 67 commits into
ttrftech:masterfrom
reald:master

Conversation

@Lusitanv

@Lusitanv Lusitanv commented Apr 2, 2020

Copy link
Copy Markdown

No description provided.

reald and others added 30 commits September 22, 2019 18:09
Added USER_CALL for personalization i.e CALLSIGN in version info screen
Callsign in version info screen
@hlovdal

hlovdal commented May 17, 2026

Copy link
Copy Markdown

This branch contains way, way, way too many changes.

For instance formatting changes like moving the curly braces at the end of for loop lines onto the next line, adding several blank lines, changing end of line encoding, etc should definitely be a separate pull request with absolutely no functional change.

The changes related to fonts are extremely out of date compared to the latest code on the master branch. As a challenge I started on attempting to rebase the branch but gave up quite fast because the master branch has changed very much.

Most likely the least amount of effort would be to start over on a new branch from latest master commit, but if you want to attempt to rebase your changes I suggest using git imerge rebase to do the rebase since it will do that in as small steps as possible. To resolve conflicts I recommend using KDiff3.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants