Merge branch 'master' into dev

# Conflicts:
#	gamelist.txt
#	src/dep/generated/driverlist.h

Signed-off-by: GZXM <[email protected]>

修订文本描述为英文符号

Merge branch 'master' into dev

清除临时生成的文件