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

enet: Sync with upstream commit c44b7d0 #90244

Merged
merged 1 commit into from
Apr 5, 2024

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga added enhancement topic:thirdparty cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Apr 5, 2024
@akien-mga akien-mga added this to the 4.3 milestone Apr 5, 2024
@akien-mga akien-mga requested a review from a team as a code owner April 5, 2024 08:13
@akien-mga akien-mga requested a review from a team April 5, 2024 08:13
@mhilbrunner
Copy link
Member

mhilbrunner commented Apr 5, 2024

LGTM, simple enough change (albeit I dislike code mixing ternary operators and pointers in complex networking code :'D)

Not using ye olde approve button as this maybe still should be rubberstamped by Fabio, but you can take this as my approval.

@akien-mga
Copy link
Member Author

Not using ye olde approve button as this should probably be rubberstamped by Fabio, but you can take this as my approval.

That possibly means condemning this PR to weeks of limbo, Fabio is a busy man :P

@mhilbrunner mhilbrunner removed the request for review from a team April 5, 2024 14:11
Copy link
Member

@mhilbrunner mhilbrunner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take the blame then. It is harmless enough.

@akien-mga akien-mga merged commit 1765f08 into godotengine:master Apr 5, 2024
17 checks passed
@akien-mga akien-mga deleted the enet-2024-03 branch April 5, 2024 15:23
@akien-mga
Copy link
Member Author

Cherry-picked for 4.2.2.

@akien-mga akien-mga removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Apr 8, 2024
@akien-mga
Copy link
Member Author

Cherry-picked for 3.6.

@akien-mga akien-mga removed cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:network labels Apr 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants