Unknown W. Brackets 6f9f9e1c98 Merge branch 'master' into mediaengine. ... Note: doesn't compile, just fixes conflicts. Conflicts: Core/HLE/sceKernel.cpp Core/HLE/sceKernelThread.cpp Core/HLE/sceKernelThread.h		2012-12-28 22:32:56 -08:00
..
MediaEngine.cpp	Fix crash with unitialized var in mpeg code.	2012-12-24 11:56:51 -08:00
MediaEngine.h	Implement large chunks of sceMpeg and scePsmf with JPSCP as a guide.	2012-11-13 18:07:20 +01:00
MemoryStick.cpp	Add a mechanism to restore event callback ptrs.	2012-12-28 13:55:24 -08:00
MemoryStick.h	Add a mechanism to restore event callback ptrs.	2012-12-28 13:55:24 -08:00
SasAudio.cpp	Savestate cleanup + be more careful with vectors.	2012-12-28 13:55:31 -08:00
SasAudio.h	Fix kernel object loading (ouch) from save states.	2012-12-28 13:55:30 -08:00