Information för DX9-Final-4.0-69

Version
4.0-69
Gren
DX9-Final
Datum
11 år, 2 månader sedan
Windows x64 Windows x86 Mac OS X
Revisionsinformation
7713be6970fef3dcadeff22d1ec7e34c33265d9e
Ändringens upphovsman
Rodolfo Bogado
Ändringens beskrivning 
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