search

libretro / retroarch-assets

Assets needed for RetroArch - e.g. menu drivers, etc. Also contains the official branding.
Creative Commons Attribution 4.0 International
170 stars 161 forks source link

rename MAME 2014 assets to MAME 2015 name #289

Closed markwkidd closed 5 years ago

markwkidd commented 5 years ago

This PR follows the merge of https://github.com/libretro/libretro-super/pull/940 which initiated the process.

The PRs relevant to the name update are:

ofry commented 5 years ago

@markwkidd Please resolve merge conflicts.

markwkidd commented 5 years ago

@orfy OK, I have fixed the conflicts, thank you

alfrix commented 5 years ago

@markwkidd some of the icons have numbers in them, you can't just rename those, they have to be modified and re-exported

markwkidd commented 5 years ago

I'm seeing this message now after I earlier saw the PR to my personal repo and wrote there. Please let me know how you would like me to prefer to proceed.

alfrix commented 5 years ago

i sent the pr to your repo so it it will be correct without another pr

markwkidd commented 5 years ago

Thanks for helping me with this. I merged your PR but there are two conflicting files

alfrix commented 5 years ago 
git remote add upstream https://github.com/libretro/retroarch-assets
git fetch upstream
git rebase -s ours upstream/master
git push
alfrix commented 5 years ago

better use git rebase -s ours upstream/master

markwkidd commented 5 years ago

That added a lot of commits to this PR but it doesn't have any conflicts at least!