mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 22:09:19 -07:00
b6e054a2be
Conflicts: Source/Core/Core/Core.vcxproj Source/Core/Core/Core.vcxproj.filters Source/Core/Core/Src/CoreParameter.cpp Source/Core/DolphinWX/Dolphin.vcxproj Source/Core/DolphinWX/Dolphin.vcxproj.filters |
||
---|---|---|
.. | ||
resources | ||
Src | ||
CMakeLists.txt | ||
Dolphin.vcxproj | ||
Dolphin.vcxproj.filters | ||
Dolphin.vcxproj.user | ||
DolphinWX.rc | ||
Info.plist.in | ||
resource.h |