dolphin/Source/Core
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
..
AudioCommon Merge pull request #2854 from Tilka/valgrind 2015-08-16 10:03:47 +02:00
Common Merge pull request #3025 from Tilka/fixfix 2015-09-23 21:09:02 +02:00
Core Merge pull request #2856 from mathieui/netplay-free 2015-08-16 10:03:49 +02:00
DiscIO Merge pull request #2829 from JosJuice/fix-wii-fst-size-2 2015-09-23 21:09:02 +02:00
DolphinQt Fix DoFileSearch returning the passed-in directories themselves. 2015-06-25 15:17:52 +02:00
DolphinWX Merge pull request #2829 from JosJuice/fix-wii-fst-size-2 2015-09-23 21:09:02 +02:00
InputCommon Merge pull request #2794 from randomstuff/evdev-stable 2015-08-16 10:06:26 +02:00
UICommon Merge pull request #2494 from Sonicadvance1/common_disassembler 2015-06-02 20:26:26 -04:00
VideoBackends Merge pull request #3066 from degasus/master 2015-09-23 21:09:03 +02:00
VideoCommon Merge pull request #3025 from Tilka/fixfix 2015-09-23 21:09:02 +02:00
CMakeLists.txt Merge pull request #1085 from waddlesplash/refactoring 2014-10-05 21:25:44 -04:00