Skip to content
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.

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

Fix font rebuild #841

Conversation

Nats-ji
Copy link
Contributor

@Nats-ji Nats-ji commented Jun 29, 2023

also updated imgui to 1.89.6

@maximegmd maximegmd changed the base branch from revert-839-revert-769-feature/its_all_about_fonts to master July 15, 2023 16:34
@maximegmd maximegmd changed the base branch from master to revert-839-revert-769-feature/its_all_about_fonts July 15, 2023 16:35
@maximegmd maximegmd changed the base branch from revert-839-revert-769-feature/its_all_about_fonts to master July 15, 2023 16:35
@maximegmd
Copy link
Owner

Can't merge in master, it contains many conflicts

@Nats-ji Nats-ji changed the base branch from master to revert-839-revert-769-feature/its_all_about_fonts July 15, 2023 17:10
@Nats-ji
Copy link
Contributor Author

Nats-ji commented Jul 15, 2023

can you merge this to branch revert-839-revert-769-feature/its_all_about_fonts first, then merge #840
this should resolve the conflicts

@maximegmd maximegmd merged commit 25c2a9d into maximegmd:revert-839-revert-769-feature/its_all_about_fonts Jul 15, 2023
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.

2 participants