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
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
..
AudioCommon fix AudioCommon::Mixer Buffer indices 2013-07-11 21:22:38 +02:00
Common Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
Core Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
DiscIO Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
DolphinWX Merge branch 'master' into wii-network 2013-08-16 19:17:07 +12:00
InputCommon InputConfigDiag: Add a simple error status label 2013-07-22 03:19:22 -04:00
VideoCommon Fix Mali-T604 shader compilation 2013-07-25 16:13:33 +00:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00