diff options
| author | TakSuyu <taksuyu@gmail.com> | 2013-07-27 12:55:51 -0700 |
|---|---|---|
| committer | TakSuyu <taksuyu@gmail.com> | 2013-07-27 12:55:51 -0700 |
| commit | dc39d093396c9a0ed4f03d81f95fcc8fa5705b65 (patch) | |
| tree | b88bf5fa692de82ce3418bdf5c55e9cd9eff37bc /gui/mainwindow.ui | |
| parent | 44498f98945b7501486da35c5fdc32f94a2be080 (diff) | |
| parent | a7a84d4dbb58565f108cb0886da6cb786e34d10d (diff) | |
| download | MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar.gz MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar.lz MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar.xz MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
gui/mainwindow.cpp
Diffstat (limited to 'gui/mainwindow.ui')
| -rw-r--r-- | gui/mainwindow.ui | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui index 771e7096..e6a82635 100644 --- a/gui/mainwindow.ui +++ b/gui/mainwindow.ui @@ -65,6 +65,9 @@ </widget> <widget class="QStatusBar" name="statusBar"/> <widget class="QToolBar" name="instanceToolBar"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="windowTitle"> <string>Instance Toolbar</string> </property> @@ -300,7 +303,7 @@ </action> <action name="actionInstanceSettings"> <property name="enabled"> - <bool>false</bool> + <bool>true</bool> </property> <property name="text"> <string>Settings</string> |