degasus a629dea4dc Merge branch 'master' into GLSL-master ...

Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...

2013-02-18 18:49:20 +01:00

..

AGL.cpp

first try of osx fix, mostly by pauldachz

2013-02-07 10:34:29 +01:00

AGL.h

Rename another function...

2012-12-26 00:34:09 -06:00

EGL.cpp

Removed the need for this temporary variable.

2013-01-24 10:53:37 -06:00

EGL.h

Fix header guard and definitions not being set to 1

2013-02-12 14:11:29 -06:00

GLX.cpp

Merge branch 'master' into GLSL-master

2013-02-18 18:49:20 +01:00

GLX.h

Move swap control to the host specific GLInterface files.

2013-01-24 10:31:08 -06:00

InterfaceBase.h

Move swap control to the host specific GLInterface files.

2013-01-24 10:31:08 -06:00

WGL.cpp

Move swap control to the host specific GLInterface files.

2013-01-24 10:31:08 -06:00

WGL.h

Move swap control to the host specific GLInterface files.

2013-01-24 10:31:08 -06:00

X11_Util.cpp

X11: Disable OSD hotkeys when the corresponding option is disabled.

2013-01-08 18:16:47 +01:00

X11_Util.h

Remove duplicated X11 code.

2012-12-26 12:12:26 -06:00