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/GameSettingsScreen.cpp
#	assets/shaders/defaultshaders.ini
This commit is contained in:
LunaMoo committed 2020-05-18 02:58:43 +02:00
2 parents 9949cb634e e29d79a5ae
commit 0f6fa442dd
94 files changed
+1022 -796
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

headless/Headless.cpp
+1 -1
View File
@@ -430,7 +430,7 @@ int main(int argc, const char* argv[])
#endif
if (stateToLoad != NULL)
SaveState::Load(stateToLoad);
SaveState::Load(stateToLoad, -1);
std::vector<std::string> failedTests;
std::vector<std::string> passedTests;