diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-28 08:49:18 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-28 08:49:18 +0200 |
| commit | 30b1f5e5cf935689fc628e37016e650655153d00 (patch) | |
| tree | 3e03af0b1e84306214347b7c0ba41f6d99ed2e42 /MultiMC.cpp | |
| parent | d6e5c472b51b3150cdac0e4b63ca89a171d881af (diff) | |
| parent | 7f4073840a9732d03c9f71f9baa08502f0bf2d94 (diff) | |
| download | MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar.gz MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar.lz MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar.xz MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.zip | |
Merge branch 'feature/fix_intel' into develop
Conflicts:
CMakeLists.txt
changelog.yaml
gui/MainWindow.cpp
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 6d01e4af..a324d4b7 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -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 |