Matthew Parlane e0c9a1fd09 Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp

2013-01-01 23:28:46 +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 'master' into wii-network

2013-01-01 23:28:46 +13:00

Core

Merge branch 'master' into wii-network

2013-01-01 23:28:46 +13:00

DiscIO

Use do { ... } while (0) for the *_LOG macros

2012-08-20 13:12:49 +02:00

DolphinWX

Improve file search speeds by deleting an unused file.

2012-12-31 15:27:36 +13:00

InputCommon

Clean up gcc/g++ compiler warnings that have accumulated.

2012-12-10 00:40:28 -06:00

VideoCommon

Clear up some warnings that crop up from -Wextra

2012-12-30 03:28:50 -06:00

CMakeLists.txt

Merge UI related projects into the main DolphinWX project.

2011-02-11 21:37:52 +00:00