Please merge Xpra changes #3
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
OK, well, I have pushed extra commits to fix the issues you've identified. I'll continue to do that until you're happy. At that point, if you want me to rebase and merge the fixup commits with earlier commits, I can. Or you can just pull the branch preserving the history. Whichever you prefer. |
|
Great, thanks Andrew. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch breaks up the diff between the Xpra shipped version of rencode and your (upstream) branch. Further discussion can be found here:
http://xpra.org/trac/ticket/851
Please merge this branch to bring these version back in sync.