Merge branch 'feature/fix_intel' into develop

Conflicts:
	CMakeLists.txt
	changelog.yaml
	gui/MainWindow.cpp
This commit is contained in:
Petr Mrázek 2014-06-28 08:49:18 +02:00
commit 30b1f5e5cf
4 changed files with 84 additions and 52 deletions

View file

@ -487,6 +487,7 @@ void MultiMC::initGlobalSettings()
// Java Settings
m_settings->registerSetting("JavaPath", "");
m_settings->registerSetting("LastHostname", "");
m_settings->registerSetting("JavaDetectionHack", "");
m_settings->registerSetting("JvmArgs", "");
// Custom Commands