Merge branch 'master' into TemporaryHackishBranch

This commit is contained in:
LunaMoo committed 2021-06-03 08:12:40 +02:00
commit c328a784a6
30 files changed
+516 -122

No files matched your search

+1 -1
View File
@@ -592,7 +592,7 @@ void SystemInfoScreen::CreateViews() {
storage->Add(new InfoItem("MemStickDirectory", g_Config.memStickDirectory.ToVisualString()));
storage->Add(new InfoItem("InternalDataDirectory", g_Config.internalDataDirectory.ToVisualString()));
storage->Add(new InfoItem("AppCacheDir", g_Config.appCacheDirectory.ToVisualString()));
storage->Add(new InfoItem("ExtStorageDir", g_Config.externalDirectory.ToVisualString()));
storage->Add(new InfoItem("DefaultCurrentDir", g_Config.defaultCurrentDirectory.ToVisualString()));
#if PPSSPP_PLATFORM(ANDROID)
storage->Add(new InfoItem("ExtFilesDir", g_extFilesDir));