Cleanup
Merge pull request #7091 from chinhodado/patch-6

Cleanup an unused variable
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