preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-12 05:50:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source 
Conflicts:
	UI/NativeApp.cpp
This commit is contained in:
Henrik Rydgard committed 2013-07-27 13:11:30 +02:00
2 parents d6b4c9c9c3 893fe76ffd
commit 5b32d2ecaf
22 files changed
+63 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/NativeApp.cpp
+1
View File
@@ -390,6 +390,7 @@ void NativeInit(int argc, const char *argv[],
}
void NativeInitGraphics() {
CheckGLExtensions();
gl_lost_manager_init();
ui_draw2d.SetAtlas(&ui_atlas);