Merge branch 'master' of https://github.com/86Box/86Box into 86Box-master

2025-02-15 09:02:14 +09:00
parent bfac770b4e 1d87a200e1
commit 8ceec325ef
934 changed files with 79465 additions and 37303 deletions
--- a/src/qt/qt_settingsdisplay.ui
+++ b/src/qt/qt_settingsdisplay.ui
@@ -106,6 +106,13 @@
     </property>
    </widget>
   </item>
+   <item row="5" column="2">
+    <widget class="QPushButton" name="pushButtonConfigure8514">
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
+   </item>
   <item row="6" column="2">
    <widget class="QPushButton" name="pushButtonConfigureXga">
     <property name="text">