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

# Conflicts:
#	src/cdrom/cdrom_image.c
#	src/cdrom/cdrom_image_backend.c
#	src/include/86box/cdrom.h
#	src/include/86box/cdrom_image_backend.h
#	src/include/86box/resource.h
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
#	src/unix/unix.c
#	src/win/win.c
#	src/win/win_devconf.c
#	src/win/win_dialog.c
#	src/win/win_joystick_rawinput.c
#	src/win/win_media_menu.c
#	src/win/win_mouse.c
#	src/win/win_settings.c
#	src/win/win_ui.c

2022-10-15 14:00:00 -03:00

..

cdrom_image_backend.c

Run clang-formats for merge

2022-10-15 13:38:10 -03:00

cdrom_image_viso.c

Virtual ISO: Use the actual basename function and remove the legacy one

2022-07-09 13:43:13 -03:00

cdrom_image.c

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

2022-10-15 14:00:00 -03:00

cdrom.c

Run clang-formats for merge

2022-10-15 13:38:10 -03:00

CMakeLists.txt

Virtual ISO: Initial commit

2022-03-26 22:17:09 -03:00