GPII-1251: Fixed to merge cleanly and work with the review 4 branch#410
Merged
kaspermarkus merged 14 commits intoGPII:review4from Oct 20, 2015
Merged
GPII-1251: Fixed to merge cleanly and work with the review 4 branch#410kaspermarkus merged 14 commits intoGPII:review4from
kaspermarkus merged 14 commits intoGPII:review4from
Conversation
added 13 commits
August 6, 2015 22:26
…ed config file that was previously moved by mistake
… login/logout actions and PCP. It now uses events instead
…n of socket communication
This is a temporary hack for review4, the PCPInterface should be re-implemented before landing master.
kaspermarkus
pushed a commit
that referenced
this pull request
Oct 20, 2015
GPII-1251: Fixed to merge cleanly and work with the review 4 branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 is meant ONLY for review 4 branch - the master version of this can be found here #386