ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
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
SVNRevGen.vcxproj fix Common lib re-linking all the time 2012-03-18 05:47:55 -07:00
make_scmrev.h.js Remove hash from revision description for cmake and windows. 2011-08-22 20:06:17 -05:00