mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-08-09 09:38:41 +00:00
Fix merge
This commit is contained in:
parent
8a1053544b
commit
b56fbe1440
1 changed files with 0 additions and 1 deletions
|
@ -77,7 +77,6 @@ static double trophyNotificationDuration = 6.0;
|
||||||
static bool useUnifiedInputConfig = true;
|
static bool useUnifiedInputConfig = true;
|
||||||
static bool overrideControllerColor = false;
|
static bool overrideControllerColor = false;
|
||||||
static int controllerCustomColorRGB[3] = {0, 0, 255};
|
static int controllerCustomColorRGB[3] = {0, 0, 255};
|
||||||
static bool separateupdatefolder = false;
|
|
||||||
static bool compatibilityData = false;
|
static bool compatibilityData = false;
|
||||||
static bool checkCompatibilityOnStartup = false;
|
static bool checkCompatibilityOnStartup = false;
|
||||||
static std::string trophyKey;
|
static std::string trophyKey;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue