Markus Wick f3f9489852 Merge pull request #5277 from stenzek/glsl-token-pasting ... OGL: Use struct for post-processing shader options		2017-04-18 09:37:34 +02:00
..
Android	Merge pull request #5118 from mahdihijazi/master	2017-04-03 16:20:34 +02:00
Core	Merge pull request #5277 from stenzek/glsl-token-pasting	2017-04-18 09:37:34 +02:00
DSPSpy	Reformat all the things. Have fun with merge conflicts.	2016-06-24 10:43:46 +02:00
DSPTool	CMakeLists: Normalize whitespace	2017-03-01 14:53:23 -05:00
PCH	Reformat all the things. Have fun with merge conflicts.	2016-06-24 10:43:46 +02:00
UnitTests	Merge pull request #5144 from MerryMage/mfspr	2017-04-10 22:30:56 +02:00
VSProps	Merge pull request #4408 from leoetlino/usb	2017-02-07 09:17:05 +13:00
.clang-format	clang-format: Sort windows.h before other headers	2017-01-23 00:35:09 -08:00
CMakeLists.txt	CMake: add CMAKE_CXX_STANDARD_REQUIRED=ON	2017-03-14 13:52:02 -07:00
dolphin-emu.sln	Add the cpp-optparse project to Externals.	2017-02-16 14:09:13 +01:00