mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-12-29 07:00:54 +01:00
9de7611ff9
Conflicts: CMakeLists.txt Source/Core/Core/Core.vcxproj Source/Core/DolphinWX/Dolphin.vcxproj Source/Core/DolphinWX/Dolphin.vcxproj.filters Source/Dolphin_2010.sln Source/VSProps/Dolphin.Win32.props Source/VSProps/Dolphin.x64.props |
||
---|---|---|
.. | ||
Base.props | ||
CodeGen_Debug.props | ||
CodeGen_DebugFast.props | ||
CodeGen_Release.props | ||
Dolphin.Win32.props | ||
Dolphin.x64.props | ||
PrecompiledHeader.props | ||
WXWOverrides.props |