dolphin/Source
flacs bfd5c6c69d Merge pull request #3066 from degasus/master
GLInterface: Fix VideoSW on linux + OSX (v2)

Conflicts:
	Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
2015-09-23 21:09:03 +02:00
..
Android Android: Persist previously-set controller bindings on the Settings menu. 2015-06-09 10:31:15 -04:00
Core Merge pull request #3066 from degasus/master 2015-09-23 21:09:03 +02:00
DSPSpy
DSPTool
PCH
UnitTests Revert "Merge pull request #2358 from Tilka/pie" 2015-07-06 09:05:25 +12:00
VSProps
.clang-format
CMakeLists.txt
dolphin-emu.sln