diff options
| author | Sky <git@bunnies.cc> | 2013-10-16 02:54:02 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-16 02:54:02 +0100 |
| commit | 71d5cf91a86bd268550a12732aebac7570cfae92 (patch) | |
| tree | 3d7a8b9415b58c61898b6a52d4c552a252bb74db | |
| parent | b5ae2e974d7044545d4f41c067e1b228806d54b7 (diff) | |
| parent | ee1be22055a8eb45521620abcfb7f4ac9ce2ff29 (diff) | |
| download | MultiMC-71d5cf91a86bd268550a12732aebac7570cfae92.tar MultiMC-71d5cf91a86bd268550a12732aebac7570cfae92.tar.gz MultiMC-71d5cf91a86bd268550a12732aebac7570cfae92.tar.lz MultiMC-71d5cf91a86bd268550a12732aebac7570cfae92.tar.xz MultiMC-71d5cf91a86bd268550a12732aebac7570cfae92.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
| -rw-r--r-- | gui/instancesettings.ui | 6 | ||||
| -rw-r--r-- | gui/settingsdialog.ui | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gui/instancesettings.ui b/gui/instancesettings.ui index 413c09b2..b536e9ff 100644 --- a/gui/instancesettings.ui +++ b/gui/instancesettings.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>477</width> + <width>526</width> <height>590</height> </rect> </property> @@ -20,7 +20,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="minecraftTab"> <attribute name="title"> @@ -249,7 +249,7 @@ <number>64</number> </property> <property name="maximum"> - <number>512</number> + <number>999999999</number> </property> <property name="singleStep"> <number>8</number> diff --git a/gui/settingsdialog.ui b/gui/settingsdialog.ui index f8e78b4d..bf173b1b 100644 --- a/gui/settingsdialog.ui +++ b/gui/settingsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>453</width> - <height>550</height> + <width>502</width> + <height>599</height> </rect> </property> <property name="sizePolicy"> @@ -33,7 +33,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="generalTab"> <attribute name="title"> @@ -353,7 +353,7 @@ <number>64</number> </property> <property name="maximum"> - <number>512</number> + <number>999999999</number> </property> <property name="singleStep"> <number>8</number> |