Merge branch 'master' into mediaengine.

Browse Source

Note: doesn't compile, just fixes conflicts.

Conflicts:
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceKernelThread.h

...

This commit is contained in:

Unknown W. Brackets committed 2012-12-28 22:32:56 -08:00

2 parents 440654e820 f9133c1a56

commit 6f9f9e1c98

212 files changed

+11915 -5209

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/HLE/sceKernelThread.cpp

+689 -362

File diff suppressed because it is too large. Load diff