sirmangler 25010e59e0 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # CMakeLists.txt # Externals/Qt~upstream_master # Readme.md # Source/Core/Core/Config/MainSettings.h # Source/Core/DolphinLib.vcxproj # Source/Core/DolphinQt/CMakeLists.txt # Source/Core/DolphinQt/DolphinQt.vcxproj # Source/Core/UICommon/DiscordPresence.cpp # Source/Core/WinUpdater/WinUpdater.vcxproj		2022-09-14 19:26:41 +01:00
..
Sys	Merge remote-tracking branch 'upstream/master'	2022-09-14 19:26:41 +01:00
51-usb-device.rules
cpack_package_description.txt
dolphin-emu-nogui.6
dolphin-emu.6
dolphin-emu.desktop	Always run as X11 app even under Wayland	2019-09-09 22:09:33 +02:00
dolphin-emu.png	Release 1.0.6	2022-06-06 11:10:06 +01:00
dolphin-emu.svg
Dolphin.icns
license.txt