Commit Graph

4 Commits

Author SHA1 Message Date
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
InvoxiPlayGames
f9e39cf200 Add Discord presence ioctlv to /dev/dolphin 2022-08-06 07:32:29 +01:00
shiiion
1fd866e988 Make linux compile 2022-02-27 19:03:27 -08:00
ssdsnake
1aa8a4d46f DolphinTool: CLI utility interface and disc image tools 2021-12-03 15:40:19 -06:00