degasus 42619c1d2d Merge branch 'ogl-tex2d' ...

Conflicts:
	Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp

2013-12-09 13:04:14 +01:00

..

AudioCommon

Re-plumb window handle to the dsound backend.

2013-11-07 09:24:56 -08:00

Common

Merge branch 'ppc_fp'

2013-11-18 19:31:09 +01:00

Core

Revert "jit: change our linking module to be able to handle arbitrary exit addresses"

2013-11-25 16:56:04 -06:00

DiscIO

fixed issue 6852.

2013-12-07 16:07:47 +09:00

DolphinWX

Merge branch 'master' into android-new-control-input-overlay

2013-11-29 21:27:17 -06:00

InputCommon

Merge branch 'master' into android-new-control-input-overlay

2013-11-24 16:12:00 -06:00

VideoBackends

Merge branch 'ogl-tex2d'

2013-12-09 13:04:14 +01:00

VideoCommon

Merge branch 'ogl-tex2d'

2013-12-09 13:04:14 +01:00

CMakeLists.txt

Put Plugins/ in Core/, rename to VideoBackends

2013-10-07 10:37:01 -04:00