Henrik Rydgard 533541615f Merge branch 'master' of github.com:hrydgard/ppsspp ... Conflicts: UI/GameInfoCache.h		2013-06-08 23:01:49 +02:00
..
Android.mk	Merge branch 'master' of github.com:hrydgard/ppsspp	2013-06-08 23:01:49 +02:00
Application.mk	Remove x86 from android build until it's fixed.	2013-04-13 22:48:45 +02:00
ArmEmitterTest.cpp	Temporary Android crashfix.	2013-03-01 16:28:20 -08:00
ArmEmitterTest.h	Make the armjit branch compile on Blackberry, compatible with iOS. Still crashes on ArmEmitterTest().	2012-12-13 11:41:30 +10:00
TestRunner.cpp	Delete the "Use Media Engine" option.	2013-06-08 22:53:36 +02:00
TestRunner.h	Restore a log statement, #pragma once.	2013-03-07 00:27:00 +01:00