External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/fix_intel' into develop

Browse Source 
Conflicts:
	CMakeLists.txt
	changelog.yaml
	gui/MainWindow.cpp
This commit is contained in:
Petr Mrázek
2014-06-28 08:49:18 +02:00
parent d6e5c472b5 7f4073840a
commit 30b1f5e5cf
4 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MultiMC.cpp
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