piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-08-04 20:18:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into compute-shader-renderer

Browse Source 
# Conflicts:
#	src/GPU.cpp
#	src/GPU.h
#	src/GPU2D_Soft.cpp
#	src/GPU3D.h
#	src/GPU3D_OpenGL.h
#	src/GPU_OpenGL.cpp
#	src/GPU_OpenGL.h
#	src/NDS.cpp
#	src/OpenGLSupport.cpp
#	src/frontend/qt_sdl/OSD.cpp
#	src/frontend/qt_sdl/main.cpp
#	src/frontend/qt_sdl/main.h
This commit is contained in:
RSDuck
2024-05-12 17:06:42 +02:00
parent e7feddaea5 c85a2103bb
commit 78828ecfca
256 changed files with 27552 additions and 18641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/VideoSettingsDialog.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright 2016-2022 melonDS team
Copyright 2016-2023 melonDS team
This file is part of melonDS.