Commit 004df767 authored by bunnei's avatar bunnei
Browse files

Merge branch 'threading' of https://github.com/bunnei/citra 

Conflicts:
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
parents c34ba380 b45a38f5
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment