mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-02 22:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into wii-network

Browse source 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
This commit is contained in:
Matthew Parlane 2013-01-01 23:28:46 +13:00
commit e0c9a1fd09
434 changed files with 39654 additions and 27613 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/VSProps/Base.props
View file

@ -20,6 +20,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x00400000</BaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project>