Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
This commit is contained in:
Michael Liebmann
2017-03-06 22:06:38 +01:00
46 changed files with 152 additions and 15 deletions

View File

@@ -2136,6 +2136,8 @@ TIMER_START();
cs_new_auto_videosystem();
#endif
g_info.hw_caps = get_hwcaps();
g_Locale = new CLocaleManager;
int loadSettingsErg = loadSetup(NEUTRINO_SETTINGS_FILE);