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

Remove duplicate #11

Merged
merged 3 commits into from
Apr 5, 2016
Merged

Remove duplicate #11

merged 3 commits into from
Apr 5, 2016

Conversation

facao
Copy link
Contributor

@facao facao commented Apr 1, 2016

No description provided.

@facao
Copy link
Contributor Author

facao commented Apr 5, 2016

Latest changes, this branch might be behind the master branch, but, we only care about the two .cpp files under lib/hsa.

@facao facao closed this Apr 5, 2016
@facao facao reopened this Apr 5, 2016
@facao
Copy link
Contributor Author

facao commented Apr 5, 2016

Please adapt the latest commit when dealing with merge conflict

@whchung whchung merged commit 8a42134 into ROCm:hsa_pool_api Apr 5, 2016
@whchung
Copy link
Collaborator

whchung commented Apr 5, 2016

Resolved conflicts and merged #11 .

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