Merge branch 'master' into turnstile

2018-10-28 21:32:46 -07:00
parent 8094a4dcc8 32fec42390
commit 887b78758d
19 changed files with 147 additions and 103 deletions
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -422,6 +422,9 @@
                    <property name="text">
                     <string/>
                    </property>
+                    <property name="wordWrap">
+                     <bool>true</bool>
+                    </property>
                   </widget>
                  </item>
                 </layout>