Skip to content

Backmerge of Changes from the 2.6.x Branch #287

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

Merged
merged 3 commits into from
Mar 5, 2025
Merged

Conversation

eXpl0it3r
Copy link
Member

@eXpl0it3r eXpl0it3r commented Mar 3, 2025

Note this PR needs to be merge with a merge commit to ensure the commit history is correctly retained

Marioalexsan and others added 2 commits January 28, 2025 13:23
…sic (#283)

* Fix early disposal of streams and unpinning of memory for Font and Music

Co-authored-by: Lukas Dürrenberger <[email protected]>
@eXpl0it3r eXpl0it3r added the Feature New functionality or extending of an existing one label Mar 3, 2025
@eXpl0it3r eXpl0it3r force-pushed the feature/backmerge branch from 9eec060 to fe8ab98 Compare March 3, 2025 12:54
@Marioalexsan
Copy link
Member

The pipeline is screaming about some of the style changes from 2.6.x that got introduced into the master branch, might be a good idea to cleanup that stuff.

@eXpl0it3r eXpl0it3r force-pushed the feature/backmerge branch from fe8ab98 to 8aeeadb Compare March 3, 2025 13:14
@eXpl0it3r eXpl0it3r merged commit 58bdbb9 into master Mar 5, 2025
32 checks passed
@eXpl0it3r eXpl0it3r deleted the feature/backmerge branch March 5, 2025 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New functionality or extending of an existing one
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants