mirror of
https://github.com/citra-emu/citra.git
synced 2025-04-08 05:00:07 +00:00

Conflicts: src/core/core.vcxproj.filters src/core/hle/function_wrappers.h src/core/hle/service/gsp.cpp src/core/hle/service/hid.cpp src/core/hle/svc.cpp