degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master ...

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging

2013-01-24 16:58:28 +01:00

..

AGL.cpp

Fix AGL.cpp

2013-01-21 21:48:02 +00:00

AGL.h

Rename another function...

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

EGL.cpp

Remove duplicated X11 code.

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

EGL.h

Remove duplicated X11 code.

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

GLX.cpp

fix msaa

2013-01-09 01:50:52 +01:00

GLX.h

Remove duplicated X11 code.

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

InterfaceBase.h

Remove duplicated X11 code.

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

WGL.cpp

Rename another function...

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

WGL.h

Rename another function...

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

WX.cpp

Fix 4 warnings on OSX

2012-12-30 04:32:37 -06:00

WX.h

Rename another function...

2012-12-26 00:34:09 -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