Information for DX9-Final-4.0-69

Version
4.0-69
Branch
DX9-Final
Date
11 years, 2 months ago
Windows x64 Windows x86 Mac OS X
Commit
7713be6970fef3dcadeff22d1ec7e34c33265d9e
Change author
Rodolfo Bogado
Change description 
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