Merge remote-tracking branch 'upstream/master'

Conflicts: gui/mainwindow.cpp
2013-07-27 12:55:51 -07:00
parent 44498f9894 a7a84d4dbb
commit dc39d09339
29 changed files with 1598 additions and 241 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -176,6 +176,7 @@ gui/instancedelegate.h
 gui/versionselectdialog.h
 gui/lwjglselectdialog.h
 gui/iconcache.h
+gui/instancesettings.h

 multimc_pragma.h

@ -208,6 +209,7 @@ gui/instancedelegate.cpp
 gui/versionselectdialog.cpp
 gui/lwjglselectdialog.cpp
 gui/iconcache.cpp
+gui/instancesettings.cpp

 java/javautils.cpp
 java/annotations.cpp
@ -228,6 +230,7 @@ gui/aboutdialog.ui
 gui/consolewindow.ui
 gui/versionselectdialog.ui
 gui/lwjglselectdialog.ui
+gui/instancesettings.ui
 )