Merge branch 'patch-1' of https://github.com/raven02/ppsspp into raven02-patch-1

Conflicts:
	Windows/ppsspp.rc
	native
This commit is contained in:
Henrik Rydgård committed 2013-07-25 18:20:08 +02:00
commit 61351e4b59
8 files changed
-23

No files matched your search

-2
View File
@@ -1238,8 +1238,6 @@ void GraphicsScreenP3::render() {
} else
g_Config.iFrameSkip = 0;
UICheckBox(GEN_ID, x, y += stride, gs->T("Display Raw Framebuffer"), ALIGN_TOPLEFT, &g_Config.bDisplayFramebuffer);
UIEnd();
}