mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-11-16 19:13:49 +01:00
2a5f353e1e69d01eb9e1a82a51cd61390cf593b6
Fixed remaining conflicts from O1L/rpcs3 (master): * Removed cellPhotoDecodeUtil.cpp, cellPhotoImportUtil.cpp and cellScreenShotUtility.cpp which are already present. * Updated cellSaveData.cpp to fix the conflicts.
rpcs3
PS3 emulator/debugger
Languages
C++
93.3%
C
4.5%
Self
0.9%
GLSL
0.7%
CMake
0.3%
Other
0.2%