degasus 316a33d1e6 Merge branch 'master' into GLSL-master ...

Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp

2012-12-27 10:36:54 +01: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

Always use the right user dir on windows.

2012-12-26 19:55:45 -05:00

Core

Merge branch 'GLES-software'

2012-12-26 12:54:58 -06:00

DiscIO

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

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

DolphinWX

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

InputCommon

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

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

VideoCommon

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

CMakeLists.txt

Merge UI related projects into the main DolphinWX project.

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