dolphin/Source/Core
Matthew Parlane b6e054a2be Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
2013-08-23 00:51:12 +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-23 00:51:12 +12:00
Core Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
DiscIO Missed some VS build options. 2013-08-16 21:42:31 +12:00
DolphinWX Merge branch 'master' into wii-network 2013-08-23 00:51:12 +12:00
InputCommon Fix compatibility with the SDL2.0 release. 2013-08-15 22:18:40 +02:00
VideoCommon Typo + Add Lima to the driverdetails. 2013-08-21 05:41:32 -05:00
CMakeLists.txt