H3cJP/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-04 19:55:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9de7611ff9
dolphin/Source/Core/Common
History
Matthew Parlane 9de7611ff9 Merge branch 'master' into wii-network 
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
2013-08-16 19:17:07 +12:00
..
Src Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
CMakeLists.txt Support PolarSSL on *nix 2013-08-15 23:36:17 +12:00
Common.vcxproj Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
Common.vcxproj.filters Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
make_scmrev.h.js
SVNRevGen.vcxproj