Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

2014-01-09 15:42:44 +00:00
parent e6201f9ff7 52c9cd5497
commit 86b6cdfcb3
6 changed files with 49 additions and 8 deletions
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@ -106,6 +106,9 @@
              <property name="text">
               <string>No channel selected.</string>
              </property>
+              <property name="wordWrap">
+               <bool>true</bool>
+              </property>
             </widget>
            </item>
           </layout>