search

notaz / picodrive

Fast MegaDrive/MegaCD/32X emulator
Other
290 stars 165 forks source link

Merge with upstream #43

Closed inactive123 closed 6 years ago

inactive123 commented 7 years ago

Hi there notaz,

apologies if this pull request is a bit messy, maybe you can come up with a better way to merge the two repos.

notaz commented 7 years ago

It doesn't merge. The conflicts could be resolved, but the diff is huge, I don't have the energy to go through all that (having some bad time) and I don't want to reset to libretro version blindly. I guess I'll keep this hanging, maybe someday something will change.

notaz commented 6 years ago

I've prepared an alternative to this: https://github.com/libretro/picodrive/pull/59