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.

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

Following upstream master #1

Open
illwieckz opened this issue Feb 17, 2022 · 3 comments
Open

Following upstream master #1

illwieckz opened this issue Feb 17, 2022 · 3 comments
Labels
enhancement New feature or request

Comments

@illwieckz
Copy link
Member

illwieckz commented Feb 17, 2022 •
edited
Loading

This repository is currently 1 commit ahead of upstream (and many commits behind).

The ahead commit is this one: 2f609aa

This commit had been merged upstream: mikke89@c71a1b1

Can we simply remove this commit from our master and merge upstream? @slipher
@slipher
Copy link

slipher commented Feb 17, 2022

The situation is described in the Unvanquished/Unvanquished#1715 OP

@illwieckz
Copy link
Member Author

Thanks, best summary may be there: Unvanquished/Unvanquished#1200 (comment)

Note that we are using a pretty old version of RmlUI now, from March 2020. I don't want to update right away because they completely changed the source layout again.

@illwieckz
Copy link
Member Author

We still use one remaining specific commit: cf67dbd

@illwieckz illwieckz added the enhancement New feature or request label Aug 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@illwieckz @slipher