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

miniupnpc: Update to version 2.2.6 #88285

Merged
merged 1 commit into from
Feb 13, 2024

Conversation

@Chubercik Chubercik requested a review from a team as a code owner February 13, 2024 14:45
@Chubercik Chubercik changed the title miniupnpc: Update to version 2.2.6 miniupnpc: Update to version 2.2.6 Feb 13, 2024
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good!

Also needs this change:

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index b620f67bc9..bb29c88443 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -350,7 +350,7 @@ License: CC0-1.0
 
 Files: ./thirdparty/miniupnpc/
 Comment: MiniUPnP Project
-Copyright: 2005-2023, Thomas Bernard
+Copyright: 2005-2024, Thomas Bernard
 License: BSD-3-clause
 
 Files: ./thirdparty/minizip/

@akien-mga akien-mga added this to the 4.3 milestone Feb 13, 2024
@akien-mga akien-mga added 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 Feb 13, 2024
@Chubercik
Copy link
Contributor Author

My bad, I keep forgetting 😅

@akien-mga akien-mga merged commit e92d55b into godotengine:master Feb 13, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@Chubercik Chubercik deleted the miniupnpc-2.2.6 branch February 14, 2024 10:49
@akien-mga
Copy link
Member

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 Mar 9, 2024
@akien-mga
Copy link
Member

Cherry-picked for 3.6.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label 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