82729fcc8f
Conflicts: Source/Core/Common/Common.vcxproj Source/Core/Common/Common.vcxproj.filters |
||
---|---|---|
.. | ||
Src | ||
resources | ||
CMakeLists.txt | ||
DolphinWX.rc | ||
DolphinWX.vcxproj | ||
DolphinWX.vcxproj.filters | ||
DolphinWX.vcxproj.user | ||
Info.plist.in | ||
resource.h |