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.

Sign up for GitHub

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

Jump to bottom

fix conflict #19588

Merged
merged 1 commit into from
Apr 10, 2019
Merged

fix conflict #19588

merged 1 commit into from
Apr 10, 2019

Conversation

minggo
Copy link
Contributor

@minggo minggo commented Apr 10, 2019

No description provided.

@minggo minggo added this to the metal-support milestone Apr 10, 2019
@minggo minggo mentioned this pull request Apr 10, 2019
Merged
@minggo minggo merged commit 195dc70 into cocos2d:metal-support Apr 10, 2019
@minggo minggo deleted the sync-19457 branch July 22, 2019 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@minggo @PatriceJiang