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

Porting my 3.x PRs to master #6483

Merged
merged 14 commits into from
Oct 19, 2020
Merged

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Aug 22, 2020

So far including my PRs (in numerical order), some not yet merged into 3.x:

PR could get merged as a whole (if and when all their counterparts pass muster and got merged into 3.x), or the individual commits can get git cherry-picked as needed. In the latter case please tick them in the above list.

See also:

@Harmoniker1
Copy link
Contributor

8 PRs with an average of 7 lines of changes! ;-)

@Jojo-Schmitz Jojo-Schmitz force-pushed the 3.x-to-master branch 5 times, most recently from 3c51510 to 46b95bc Compare August 23, 2020 07:22
@Jojo-Schmitz Jojo-Schmitz changed the title [WIP] Porting 3.x PRs to master Porting my 3.x PRs to master Aug 23, 2020
@Jojo-Schmitz Jojo-Schmitz marked this pull request as ready for review August 24, 2020 09:18
@Jojo-Schmitz Jojo-Schmitz force-pushed the 3.x-to-master branch 4 times, most recently from 7418554 to 8fe8761 Compare August 31, 2020 13:29
@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Sep 2, 2020

Will rebase it to resolve merge conflicts, that'll loose the commits that have been merged already.

@Jojo-Schmitz Jojo-Schmitz force-pushed the 3.x-to-master branch 2 times, most recently from d2cbee8 to 9dc1c4c Compare September 2, 2020 15:27
@Jojo-Schmitz
Copy link
Contributor Author

BTW: I'm not opposing any of these fixes being merged to master before merging them into 3.x ;-)
Might save me the work to rebase once in a while...

@Jojo-Schmitz Jojo-Schmitz force-pushed the 3.x-to-master branch 2 times, most recently from 56e5424 to 7f5e04b Compare October 13, 2020 14:17
simplify CMAkeListe.txt for tours and save some space by not
installing any *_en.qm files
* Clarify the "don't ask again"
* Mention the current MuseScore version (that way the same dialog still
  works in MuseScore 4)
* Don't mark the score dirty if the reset is taken
and use Steinberg's naming to easy further updates
but not for Windows, due to a problem with WIX, see musescore@daa5fb7#comments
Adding mnemonics for Save, Save As… and Resource Manager…, Print…,
Parts… and Export…

See https://musescore.org/en/node/309973
and in the same way as it is done in PianoLevels::updateNotes()and
NoteTweakerDialog::updateNotes()
@igorkorsukov igorkorsukov merged commit 51b720e into musescore:master Oct 19, 2020
@Jojo-Schmitz Jojo-Schmitz deleted the 3.x-to-master branch October 19, 2020 11:36
@Jojo-Schmitz Jojo-Schmitz mentioned this pull request Oct 19, 2020
Jojo-Schmitz referenced this pull request in cbjeukendrup/MuseScore Aug 30, 2021
Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 8, 2022
"Backport" of a single missing commit from musescore#6483, resp. including the
never merged musescore#6489
Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 12, 2022
"Backport" of a single missing commit from musescore#6483, resp. including the
never merged musescore#6489
Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
"Backport" of a single missing commit from musescore#6483, resp. including the
never merged musescore#6489
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.

None yet

3 participants