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

Sync with OS commit 6e3099ac18718043334c9e8277b772aa1c46cedd #486

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Sync with OS commit 6e3099ac18718043334c9e8277b772aa1c46cedd #486

wants to merge 17 commits into from
+19 −7

Conversation

dunhor
Copy link
Member

@dunhor dunhor commented Nov 14, 2024

No description provided.

dunhor added 15 commits January 22, 2024 11:41
@ChrisGuzak
Copy link
Member

@dunhor feel free to merge.

@dunhor
Copy link
Member Author

dunhor commented Dec 19, 2024

@dunhor feel free to merge.

At the moment I need to wait for a change that hasn't quite reached our branch. It seems the unique_process_heap_ansistring change caused a number of duplicate definition errors with code in osdep. The vpack has an update which removes the duplicate definition, however that update also requires other unrelated changes I need to wait for as well.

@dunhor
Copy link
Member Author

dunhor commented Dec 19, 2024

At the moment I need to wait for a change that hasn't quite reached our branch

And it looks like it only just yesterday reached ge_current_nicurrent, which is hopefully a good sign, but will probably have to wait for the new year

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

@dmachaj dmachaj dmachaj approved these changes

@ChrisGuzak ChrisGuzak ChrisGuzak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dunhor @ChrisGuzak @dmachaj