Correct a namespace typo
Merge pull request #7049 from AbandonedCart/master

Correct a namespace typo
Rebase RadarNyan work on Generate version while build on Wiondows
Merge branch 'windows-exe-version' of https://github.com/RadarNyan/ppsspp into verbuild

Conflicts:
	Windows/version.rc