Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

2021-11-24 20:09:55 -03:00
parent 1504b6805a 888ac1d2aa
commit b6904db51f
45 changed files with 0 additions and 0 deletions
--- a/src/win/icons/86Box-RB.ico
+++ b/src/win/icons/86Box-RB.ico
--- a/src/win/icons/86Box.ico
+++ b/src/win/icons/86Box.ico
--- a/src/win/icons/cartridge.ico
+++ b/src/win/icons/cartridge.ico
--- a/src/win/icons/cartridge_empty.ico
+++ b/src/win/icons/cartridge_empty.ico
--- a/src/win/icons/cassette.ico
+++ b/src/win/icons/cassette.ico
--- a/src/win/icons/cassette_active.ico
+++ b/src/win/icons/cassette_active.ico
--- a/src/win/icons/cassette_empty.ico
+++ b/src/win/icons/cassette_empty.ico
--- a/src/win/icons/cassette_empty_active.ico
+++ b/src/win/icons/cassette_empty_active.ico
--- a/src/win/icons/cdrom.ico
+++ b/src/win/icons/cdrom.ico
--- a/src/win/icons/cdrom_active.ico
+++ b/src/win/icons/cdrom_active.ico
--- a/src/win/icons/cdrom_disabled.ico
+++ b/src/win/icons/cdrom_disabled.ico
--- a/src/win/icons/cdrom_empty.ico
+++ b/src/win/icons/cdrom_empty.ico
--- a/src/win/icons/cdrom_empty_active.ico
+++ b/src/win/icons/cdrom_empty_active.ico
--- a/src/win/icons/display.ico
+++ b/src/win/icons/display.ico
--- a/src/win/icons/floppy_35.ico
+++ b/src/win/icons/floppy_35.ico
--- a/src/win/icons/floppy_35_active.ico
+++ b/src/win/icons/floppy_35_active.ico
--- a/src/win/icons/floppy_35_empty.ico
+++ b/src/win/icons/floppy_35_empty.ico
--- a/src/win/icons/floppy_35_empty_active.ico
+++ b/src/win/icons/floppy_35_empty_active.ico
--- a/src/win/icons/floppy_525.ico
+++ b/src/win/icons/floppy_525.ico
--- a/src/win/icons/floppy_525_active.ico
+++ b/src/win/icons/floppy_525_active.ico
--- a/src/win/icons/floppy_525_empty.ico
+++ b/src/win/icons/floppy_525_empty.ico
--- a/src/win/icons/floppy_525_empty_active.ico
+++ b/src/win/icons/floppy_525_empty_active.ico
--- a/src/win/icons/floppy_and_cdrom_drives.ico
+++ b/src/win/icons/floppy_and_cdrom_drives.ico
--- a/src/win/icons/floppy_disabled.ico
+++ b/src/win/icons/floppy_disabled.ico
--- a/src/win/icons/hard_disk.ico
+++ b/src/win/icons/hard_disk.ico
--- a/src/win/icons/hard_disk_active.ico
+++ b/src/win/icons/hard_disk_active.ico
--- a/src/win/icons/input_devices.ico
+++ b/src/win/icons/input_devices.ico
--- a/src/win/icons/machine.ico
+++ b/src/win/icons/machine.ico
--- a/src/win/icons/mo.ico
+++ b/src/win/icons/mo.ico
--- a/src/win/icons/mo_active.ico
+++ b/src/win/icons/mo_active.ico
--- a/src/win/icons/mo_disabled.ico
+++ b/src/win/icons/mo_disabled.ico
--- a/src/win/icons/mo_empty.ico
+++ b/src/win/icons/mo_empty.ico
--- a/src/win/icons/mo_empty_active.ico
+++ b/src/win/icons/mo_empty_active.ico
--- a/src/win/icons/network.ico
+++ b/src/win/icons/network.ico
--- a/src/win/icons/network_active.ico
+++ b/src/win/icons/network_active.ico
--- a/src/win/icons/other_peripherals.ico
+++ b/src/win/icons/other_peripherals.ico
--- a/src/win/icons/other_removable_devices.ico
+++ b/src/win/icons/other_removable_devices.ico
--- a/src/win/icons/ports.ico
+++ b/src/win/icons/ports.ico
--- a/src/win/icons/sound.ico
+++ b/src/win/icons/sound.ico
--- a/src/win/icons/storage_controllers.ico
+++ b/src/win/icons/storage_controllers.ico
--- a/src/win/icons/zip.ico
+++ b/src/win/icons/zip.ico
--- a/src/win/icons/zip_active.ico
+++ b/src/win/icons/zip_active.ico
--- a/src/win/icons/zip_disabled.ico
+++ b/src/win/icons/zip_disabled.ico
--- a/src/win/icons/zip_empty.ico
+++ b/src/win/icons/zip_empty.ico
--- a/src/win/icons/zip_empty_active.ico
+++ b/src/win/icons/zip_empty_active.ico