Merge branch 'feature_theme_support' into develop

Conflicts:
	main.cpp
This commit is contained in:
Petr Mrázek
2014-06-30 22:22:09 +02:00
60 changed files with 2108 additions and 8 deletions

View File

@@ -355,6 +355,7 @@ void MultiMC::initGlobalSettings()
// Updates
m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);
m_settings->registerSetting("AutoUpdate", true);
m_settings->registerSetting("IconTheme", QString("multimc"));
// Notifications
m_settings->registerSetting("ShownNotifications", QString());