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

Unit testing PR to merge #105

Merged
merged 21 commits into from
Oct 12, 2016
Merged

Unit testing PR to merge #105

merged 21 commits into from
Oct 12, 2016

Conversation

mperrin
Copy link
Contributor

@mperrin mperrin commented Oct 12, 2016

See #101

@semaphoreP
Copy link
Contributor

Looks fine to me. What was the reason why the merge wasn't automatic? Was gpi_pipeline_primitives.xml updated in both branches?

@mperrin
Copy link
Contributor Author

mperrin commented Oct 12, 2016

Right, hence why I filed #104

@mperrin mperrin merged commit 696eee3 into master Oct 12, 2016
@mperrin mperrin deleted the unit-testing branch October 12, 2016 16:54
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