Matthew Parlane 9754fda516 Merge branch 'wii-usb' into temp merge branch ... Conflicts: Source/Core/Common/Src/Log.h Source/Core/Core/Core.vcxproj Source/Core/Core/Core.vcxproj.filters Source/VSProps/Dolphin.Win32.props Source/VSProps/Dolphin.x64.props		2013-01-11 23:07:12 +13:00
..
AudioCommon	(CoreAudio) Retain volume value until initialization. Makes volume slider work when game isn't running. Fixes issue 5383.	2012-12-14 12:15:01 -06:00
Common	Merge branch 'wii-usb' into temp merge branch	2013-01-11 23:07:12 +13:00
Core	Merge branch 'wii-usb' into temp merge branch	2013-01-11 23:07:12 +13:00
DiscIO	Use do { ... } while (0) for the *_LOG macros	2012-08-20 13:12:49 +02:00
DolphinWX	Change the application name to "Dolphin Emulator" (from "Dolphin-emu").	2013-01-07 17:05:51 -06:00
InputCommon	Fixed the infinite rumble problem caused by r4d6056f14625.	2013-01-07 12:25:18 +11:00
VideoCommon	Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae	2013-01-07 13:47:34 -06:00
CMakeLists.txt