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

NW for MK: fn:op (173) #198

Merged
merged 3 commits into from
Oct 11, 2022
Merged

NW for MK: fn:op (173) #198

merged 3 commits into from
Oct 11, 2022

Conversation

ndw
Copy link
Contributor

@ndw ndw commented Oct 10, 2022

This PR is intended to be technically equivalent to #173.

I've reworked a series of MK commits so that they are independent; I fear we would wind up with merge conflicts otherwise and cleaning up the merge conflicts, without accidentally making some other change, seemed riskier than just teasing them apart and making them independent before we accept and merge them.

Copy link
Contributor

@ChristianGruen ChristianGruen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@ndw
Copy link
Contributor Author

ndw commented Oct 11, 2022

Accepted at the CG meeting of 11 October 2022.

@ndw ndw merged commit 93cf4c9 into qt4cg:master Oct 11, 2022
@ndw ndw deleted the nw-173-fn-op branch October 11, 2022 16:40
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