2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
yuzu/src/core/hle/service/sm
bunnei b1d5db1cf6 Merge remote-tracking branch 'upstream/master' into nx
# Conflicts:
#	src/core/CMakeLists.txt
#	src/core/arm/dynarmic/arm_dynarmic.cpp
#	src/core/arm/dyncom/arm_dyncom.cpp
#	src/core/hle/kernel/process.cpp
#	src/core/hle/kernel/thread.cpp
#	src/core/hle/kernel/thread.h
#	src/core/hle/kernel/vm_manager.cpp
#	src/core/loader/3dsx.cpp
#	src/core/loader/elf.cpp
#	src/core/loader/ncch.cpp
#	src/core/memory.cpp
#	src/core/memory.h
#	src/core/memory_setup.h
2017-10-09 23:56:20 -04:00
..
sm.cpp HLE/SRV: Implemented RegisterService. 2017-09-24 00:12:58 -05:00
sm.h HLE/SRV: Implemented RegisterService. 2017-09-24 00:12:58 -05:00
srv.cpp Merge remote-tracking branch 'upstream/master' into nx 2017-10-09 23:56:20 -04:00
srv.h HLE/SRV: Implemented RegisterService. 2017-09-24 00:12:58 -05:00