Merge remote-tracking branch 'upstream/master'

2021-10-01 23:42:21 +03:00
parent 978b625e4e 3a77bc3628
commit f353721956
21 changed files with 407 additions and 750 deletions
@@ -74,6 +74,7 @@ SettingTable _win32_settings{ _win32_settings_table };
 #endif /* _WIN32 */
 namespace citymania {
 	SettingTable _settings{ _citymania_settings_table };
+	SettingTable _cmclient_settings{ _cmclient_settings_table };
 }  // namespace citymania

 /* Begin - Callback Functions for the various settings. */