Merge branch 'master' into mediaengine

Browse Source

Conflicts:
	Common/LogManager.cpp
	Core/CMakeLists.txt
	Core/Core.vcxproj
	Core/Core.vcxproj.filters
	Core/CoreParameter.h
	Core/HLE/sceAudio.cpp
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceMpeg.cpp
	android/jni/Android.mk

...

This commit is contained in:

Henrik Rydgard committed 2012-12-17 18:48:32 +01:00

2 parents 0019d88a44 213320607c

commit bc214dcf37

266 files changed

+19234 -7495

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

+479 -206

File diff suppressed because it is too large. Load diff