Merge branch 'master' into fast-forward-hotkey

This commit is contained in:
Arisotura
2019-06-04 15:53:08 +02:00
committed by GitHub
61 changed files with 5643 additions and 693 deletions

View File

@ -40,8 +40,12 @@ bool HasConfigFile(const char* fileName);
void Load();
void Save();
extern int _3DRenderer;
extern int Threaded3D;
extern int GL_ScaleFactor;
extern int GL_Antialias;
}
#endif // CONFIG_H