Swap these back. Add an automerger for the mappings instead.
Merge branch 'master' of github.com:libretro/snes9x

Conflicts:
	memmap.cpp