mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-02-26 00:45:49 +00:00
Merge branch 'master' of https://github.com/hrydgard/ppsspp
Conflicts: GPU/GLES/TextureScaler.cpp
This commit is contained in:
commit
f538c1250e