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
..
CMakeLists.txt	cmake: Don't use PCH with Qt6.	2022-05-22 01:19:44 +02:00
Main.cpp	treewide: convert GPLv2+ license info to SPDX tags	2021-07-05 04:35:56 +02:00
Updater.exe.manifest	Update supportedOS values in .manifest files	2022-08-05 10:26:22 +10:00
WinUI.cpp	treewide: convert GPLv2+ license info to SPDX tags	2021-07-05 04:35:56 +02:00
WinUpdater.vcxproj	msbuild: tidy up the linked libs	2022-08-02 22:24:22 -07:00
WinUpdater.vcxproj.filters	Updated to Updated to 5.0-16380	2022-05-26 20:27:42 -07:00