Version
4.0-69
Gren
DX9-Final
Dato
11 år, 1 måned siden
Windows x64 Windows x86 Mac OS X
Commit
7713be6970fef3dcadeff22d1ec7e34c33265d9e
Skift forfatter
Rodolfo Bogado
Skift beskrivelse
Merge branch 'master' of https://code.google.com/p/dolphin-emu into DX9-Final

Conflicts:
	Source/Core/VideoCommon/Src/MainBase.cpp
	Source/Core/VideoCommon/Src/RenderBase.cpp