mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 19:12:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
e0c9a1fd09
dolphin/Source/Core/Common
History
Matthew Parlane e0c9a1fd09 Merge branch 'master' into wii-network 
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
2013-01-01 23:28:46 +13:00
..
Src Merge branch 'master' into wii-network 2013-01-01 23:28:46 +13:00
CMakeLists.txt move SettingsHandler to Common lib 2012-02-09 21:04:07 -08:00
Common.vcxproj Merge branch 'master' into wii-network 2012-05-16 09:27:37 +02:00
Common.vcxproj.filters Merge branch 'master' into wii-network 2012-05-16 09:27:37 +02:00
make_scmrev.h.js Remove hash from revision description for cmake and windows. 2011-08-22 20:06:17 -05:00
SVNRevGen.vcxproj fix Common lib re-linking all the time 2012-03-18 05:47:55 -07:00