claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hdd-speed

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-08 13:58:05 -05:00
parent 40d39f1baa 14fa9649a8
commit 9291b184fe
26 changed files with 217 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/languages/en-US.rc
View File

@@ -34,6 +34,7 @@ BEGIN
MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
MENUITEM "&Resizeable window", IDM_VID_RESIZE
MENUITEM "R&emember size && position", IDM_VID_REMEMBER
MENUITEM SEPARATOR
@@ -271,6 +272,7 @@ END
#define STR_DYNAREC "Dynamic Recompiler"
#define STR_VIDEO "Video:"
#define STR_VIDEO_2 "Video 2:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_XGA "XGA Graphics"