Merge branch '86Box:master' into ui-changes

2022-01-29 21:54:22 -05:00
parent caad8ae91b a0c90097e4
commit b85b764f18
104 changed files with 3704 additions and 865 deletions
--- a/src/include/86box/resource.h
+++ b/src/include/86box/resource.h
@@ -313,6 +313,7 @@
 #endif
 #define IDM_CONFIG		40020
 #define IDM_VID_HIDE_STATUS_BAR	40021
+#define IDM_VID_HIDE_TOOLBAR	40022
 #define IDM_UPDATE_ICONS	40030
 #define IDM_SND_GAIN		40031
 #define IDM_VID_RESIZE		40040