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

This commit is contained in:
Jasmine Iwanek
2022-01-29 21:54:22 -05:00
committed by GitHub
104 changed files with 3704 additions and 865 deletions

View File

@@ -139,6 +139,13 @@ END
185 ICON DISCARDABLE ICON_PATH "icons/mo_empty_active.ico"
192 ICON DISCARDABLE ICON_PATH "icons/cassette_empty.ico"
193 ICON DISCARDABLE ICON_PATH "icons/cassette_empty_active.ico"
200 ICON DISCARDABLE ICON_PATH "icons/run.ico"
201 ICON DISCARDABLE ICON_PATH "icons/pause.ico"
202 ICON DISCARDABLE ICON_PATH "icons/send_cad.ico"
203 ICON DISCARDABLE ICON_PATH "icons/send_cae.ico"
204 ICON DISCARDABLE ICON_PATH "icons/hard_reset.ico"
205 ICON DISCARDABLE ICON_PATH "icons/acpi_shutdown.ico"
206 ICON DISCARDABLE ICON_PATH "icons/settings.ico"
232 ICON DISCARDABLE ICON_PATH "icons/cartridge_empty.ico"
240 ICON DISCARDABLE ICON_PATH "icons/machine.ico"
241 ICON DISCARDABLE ICON_PATH "icons/display.ico"
@@ -372,6 +379,7 @@ END
#include "languages/it-IT.rc"
#include "languages/ja-JP.rc"
#include "languages/ko-KR.rc"
#include "languages/pl-PL.rc"
#include "languages/pt-BR.rc"
#include "languages/pt-PT.rc"
#include "languages/ru-RU.rc"