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

Follow project coding style. Issue #2192. #6212

Merged
merged 1 commit into from
Jan 20, 2017

Conversation

magao
Copy link
Contributor

@magao magao commented Jan 8, 2017

Result of running uncrustify with the qBittorrent uncrustify.cfg on all the files used in my pull requests. All other pull requests that use any of these files have been rebased on top of this commit.

@magao
Copy link
Contributor Author

magao commented Jan 18, 2017

@sledgehammer999 This PR has all the uncrustify changes - all my other PRs are on top of this one.

@magao
Copy link
Contributor Author

magao commented Jan 20, 2017

@sledgehammer999 New commit without the mainwindow.cpp/h uncrustifying.

I have to head out for most of today, but when I get back I'll rebase all the other PRs on top of master (assuming this has been merged).

@sledgehammer999
Copy link
Member

I think this is good. So thx and merging.

@sledgehammer999 sledgehammer999 merged commit c8ddd68 into qbittorrent:master Jan 20, 2017
@magao
Copy link
Contributor Author

magao commented Jan 20, 2017

I thought by separating out the uncrustifying to a separate PR with all the others on top would simplify things. Didn't work so well - especially when I kept referring to the issue #2192 instead of the PR #6212 ...

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.

2 participants