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

Rebase to latest git #27

Merged
merged 106 commits into from
Jan 3, 2016
Merged

Rebase to latest git #27

merged 106 commits into from
Jan 3, 2016

Conversation

sergiobenrocha2
Copy link

Rebasing to latest git. It's working on Linux x86_64 at least.

Needs to compile with -DMINIMAL_CORE=2 now.

I can't rebase it properly, too many conflicts starting with src/gba/audio.h (I came back to aliaspider last commit)

andres-asm pushed a commit that referenced this pull request Jan 3, 2016
@andres-asm andres-asm merged commit 4b7cd20 into libretro:master Jan 3, 2016
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.

5 participants