3 Commits

Author SHA1 Message Date
inspuration
1d6ea166c1 Merge branch 'master' into threading
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
2014-06-10 15:17:04 -04:00
Tony Wasserka
3240b6ef31 GPU: Cleanup register definitions. 2014-06-04 23:42:51 +02:00
Tony Wasserka
7c5f1647be Rename LCD to GPU. 2014-06-04 23:42:51 +02:00