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

Wii U travis build broken (OK to merge now) #58

Merged
merged 1 commit into from Oct 15, 2020

Conversation

bbbradsmith
Copy link
Contributor

Testing whether the header is enough to make the previous code build. Please do not merge unless this actually fixes the travis build.

@inactive123
Copy link
Contributor

Hmm, seems like you need to resolve the conflict first.

…test it

added libretro-common/include/features_cpu.h
@bbbradsmith bbbradsmith changed the title Wii U travis build broken (do not merge) Wii U travis build broken (OK to merge now) Oct 15, 2020
@bbbradsmith
Copy link
Contributor Author

OK that worked, feel free to merge

@inactive123 inactive123 merged commit aa30fe9 into libretro:master Oct 15, 2020
@bbbradsmith bbbradsmith deleted the wiiu_travis_fix_2 branch October 15, 2020 20:50
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.

None yet

2 participants