libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-24 00:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6f9f9e1c98
ppsspp/android/jni
History
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
..
Android.mk Merge branch 'master' into mediaengine. 2012-12-28 22:32:56 -08:00
Application.mk Add armeabi on android 2012-12-02 22:48:31 +01:00
EmuScreen.cpp Non-windows button mapping tweaks 2012-12-26 08:51:03 +01:00
EmuScreen.h Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK. 2012-11-04 23:24:00 +01:00
GamepadEmu.cpp Fix buttons for the virtual gamepad 2012-12-28 13:49:36 +01:00
GamepadEmu.h Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK. 2012-11-04 23:24:00 +01:00
MenuScreens.cpp Don't log display lists, instead dump them on demand. 2012-12-27 23:38:55 +01:00
MenuScreens.h windows gui option for buffered rendering. Misc fixes, prettier checkbox on android. 2012-11-20 11:35:48 +01:00
NativeApp.cpp Don't log display lists, instead dump them on demand. 2012-12-27 23:38:55 +01:00
ui_atlas.cpp windows gui option for buffered rendering. Misc fixes, prettier checkbox on android. 2012-11-20 11:35:48 +01:00
ui_atlas.h windows gui option for buffered rendering. Misc fixes, prettier checkbox on android. 2012-11-20 11:35:48 +01:00
UIShader.cpp Fixes to usage of gl state stuff 2012-11-25 17:21:23 +01:00
UIShader.h Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK. 2012-11-04 23:24:00 +01:00