Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/core/re3.cpp
This commit is contained in:
Sergeanur 2021-01-23 17:54:46 +02:00
commit e9689a0a07
16 changed files with 561 additions and 189 deletions

View file

@ -49,8 +49,10 @@ void TheModelViewer(void);
#endif
#ifdef LOAD_INI_SETTINGS
void LoadINISettings();
bool LoadINISettings();
void SaveINISettings();
void LoadINIControllerSettings();
void SaveINIControllerSettings();
#endif
#ifdef NEW_RENDERER