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.

Sign up for GitHub

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

Jump to bottom

Several Duplicate headers and conditions #3313

Merged
merged 4 commits into from Nov 16, 2017
Merged

Several Duplicate headers and conditions #3313

merged 4 commits into from Nov 16, 2017

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Oct 13, 2017 •
edited

  • Fix #258301: 2 duplicate header files in libmscore/cmd.cpp
  • Fix #258146: duplicate header file in mscore/scoretab.cpp
  • Fix #258121: duplicate condition in libmscore/rest.cpp
  • Fix #258131: duplicate condition in mscore/scoreview.cpp

For the top 3 the fix is very obvious, the 4th needs a review though, as that 2nd condition had been ignored previously, but now is no longer.

The 1st, 2nd and 3rd apply to master and 2.2, the 4th only to master

@lasconic
Copy link
Contributor

Looks good, the 4th included. Thanks!

@lasconic lasconic merged commit 9a123fa into musescore:master Nov 16, 2017
@Jojo-Schmitz
Copy link
Contributor Author

1st, 2nd and 3rd for 2.2 too?

@Jojo-Schmitz
Copy link
Contributor Author

Ah, I see you merged it manually

@Jojo-Schmitz Jojo-Schmitz deleted the duplicates branch November 17, 2017 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Jojo-Schmitz @lasconic