Merge branch 'develop' into cpak-management

This commit is contained in:
Robin Jones 2024-11-11 17:37:25 +00:00 committed by GitHub
commit 5cd3260d7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -42,11 +42,6 @@ SRCS = \
menu/actions.c \ menu/actions.c \
menu/cart_load.c \ menu/cart_load.c \
menu/cpak_handler.c \ menu/cpak_handler.c \
menu/ui_components/background.c \
menu/ui_components/boxart.c \
menu/ui_components/common.c \
menu/ui_components/context_menu.c \
menu/ui_components/file_list.c \
menu/disk_info.c \ menu/disk_info.c \
menu/fonts.c \ menu/fonts.c \
menu/hdmi.c \ menu/hdmi.c \
@ -57,6 +52,11 @@ SRCS = \
menu/rom_info.c \ menu/rom_info.c \
menu/settings.c \ menu/settings.c \
menu/sound.c \ menu/sound.c \
menu/ui_components/background.c \
menu/ui_components/boxart.c \
menu/ui_components/common.c \
menu/ui_components/context_menu.c \
menu/ui_components/file_list.c \
menu/usb_comm.c \ menu/usb_comm.c \
menu/views/browser.c \ menu/views/browser.c \
menu/views/credits.c \ menu/views/credits.c \