magumagu 49f223a211 Remove setting "BlockMerging". ... It isn't hooked up to anything anymore, and it isn't the sort of thing we want users messing with anyway.		2015-02-11 19:52:48 -08:00
..
Android	Update Android cmake.	2015-01-26 21:26:54 -06:00
Core	Remove setting "BlockMerging".	2015-02-11 19:52:48 -08:00
DSPSpy	More minor consistency changes	2015-01-12 22:28:12 -05:00
DSPTool
PCH	Fix Intellisense error spam on Visual Studio.	2015-01-23 19:15:25 -08:00
UnitTests	Revert "Merge pull request #1903 from RisingFog/libav"	2015-01-26 02:35:29 +01:00
VSProps	Fix Intellisense error spam on Visual Studio.	2015-01-23 19:15:25 -08:00
.clang-format
CMakeLists.txt
dolphin-emu.sln	xxhash: Add cmake + VS files	2015-01-21 07:35:34 +01:00