preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 02:29:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into TemporaryHackishBranch

Browse Source 
# Conflicts:
#	UI/DevScreens.cpp
Also some changes to placement of the new option on dev menu.
This commit is contained in:
LunaMoo committed 2020-02-23 17:03:42 +01:00
2 parents 8452a56c38 6610cd7663
commit 18c822742d
156 files changed
+3912 -1605
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/CwCheatScreen.cpp
+2 -2
View File
@@ -79,8 +79,8 @@ void CwCheatScreen::CreateCodeList() {
void CwCheatScreen::CreateViews() {
using namespace UI;
I18NCategory *cw = GetI18NCategory("CwCheats");
I18NCategory *di = GetI18NCategory("Dialog");
auto cw = GetI18NCategory("CwCheats");
auto di = GetI18NCategory("Dialog");
CreateCodeList();
g_Config.bReloadCheats = true;
root_ = new LinearLayout(ORIENT_HORIZONTAL);