Skip to content

Conversation

zonkmachine
Copy link
Contributor

Uses upstream files to fix #326

[oskar.wallgren13@gmail.com: backported from master]

Uses upstream files to fix LMMS#326

[oskar.wallgren13@gmail.com: backported from master]
@tresf
Copy link
Member

tresf commented Jul 23, 2017

@zonkmachine did you try a git cherry-pick first? If there are no conflicts, this should be able to be directly applied to stable-1.2 without a PR at all.

@PhysSong
Copy link
Member

@zonkmachine I think this PR is not needed. Many devs agreed that this backporting is needed.
I also think git cherry-pick would be better.

@zonkmachine
Copy link
Contributor Author

This is a cherry-pick to a branch off stable-1.2. You mean I should cherry-pick directly onto stable-1.2 and just push?

@PhysSong
Copy link
Member

@zonkmachine Yes. I think that will be better.

@zonkmachine zonkmachine merged commit 587989b into LMMS:stable-1.2 Jul 24, 2017
@zonkmachine
Copy link
Contributor Author

I pushed to stable-1.2 directly ... which caused this PR to be merged.

@zonkmachine zonkmachine deleted the freeboybackport branch July 24, 2017 02:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Glitchy Sound in FreeBoy
4 participants