Merge 2.4 to 2.5 #13564
Closed
Merge 2.4 to 2.5 #13564
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…er-error-messaget Friendlier error message if Engine export fails for track
This can be fixed by deleting the outro cue points and reload the track into a deck. Fixes mixxxdj#13449
Fix detection last sound if track does not end with silence.
…mit-hooks chore: update pre-commit hook
|
I might have gone a bit too quick with this one... @Swiftb0y should I close that PR? |
|
I'm afraid I can't follow you? Whats wrong with which PR? |
|
This is a follow up with #13530, however I took all the changes from 2.4 for 2.5, instead of cherry picking just my fix, so perhaps it would have been better? If we are happy with a full sync, then all good! |
|
Ah, well we also have the 2.5 branch, so usually the workflow is 2.4->2.5->main. I'll take care of merging locally and push directly. |
|
fyi, I'm currently fighting with DavidAnson/markdownlint#1328 So merging to the newer branches will have to wait until we have resolved that (or we downgrade markdownlint again for now). |
|
done. though CI still fails because of codespell... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges the following changes to
2.5