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

NSIS.MUI2.General-Merge (Review wanted!) #537

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

Tobias-B-Besemer
Copy link
Contributor

To make progress and make it easier for you, some changes as single PRs...

Also:
* New header
* A bit of code re-sort
@Tobias-B-Besemer Tobias-B-Besemer changed the title NSIS.Merge (Review wanted) NSIS.Merge (1st PR of NSIS changes in very small piece) (Review wanted!) Nov 30, 2019
@Tobias-B-Besemer
Copy link
Contributor Author

@az0, is there any regression open on this very small PR (first of all NSIS changes in very small piece), or why you haven't checked in it by now?

@Tobias-B-Besemer Tobias-B-Besemer changed the title NSIS.Merge (1st PR of NSIS changes in very small piece) (Review wanted!) NSIS.MUI2.Merge (1st PR of NSIS changes in very small piece) (Review wanted!) Nov 30, 2019
@coveralls
Copy link

coveralls commented Dec 1, 2019

Coverage Status

Coverage decreased (-0.05%) to 61.9% when pulling cd71831 on Tobias-B-Besemer:NSIS.Merge into db6c094 on bleachbit:master.

@Tobias-B-Besemer Tobias-B-Besemer changed the title NSIS.MUI2.Merge (1st PR of NSIS changes in very small piece) (Review wanted!) NSIS.MUI2.General-merge (Review wanted!) Dec 1, 2019
@Tobias-B-Besemer
Copy link
Contributor Author

OK, finally this PR build without merge conflicts, again! :-)

@Tobias-B-Besemer Tobias-B-Besemer changed the title NSIS.MUI2.General-merge (Review wanted!) NSIS.MUI2.General-Merge (Review wanted!) Dec 1, 2019
@Tobias-B-Besemer
Copy link
Contributor Author

@az0, do you have any questions or regressions to this PR ???

@az0
Copy link
Member

az0 commented Dec 21, 2019

This has a merge conflict in winows/bleachbit.nsi. I think it's conflicting with 3e5f677 that was already merged.

@Tobias-B-Besemer
Copy link
Contributor Author

OK, I look how I can fix that.

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