Stenzek 27d7a1646c Merge pull request #5065 from JosJuice/character ...

Fix issue 10146 (compilation issue because of colliding defines)

2017-03-11 18:26:26 +10:00

..

Android

Merge pull request #4999 from stenzek/renderer-statics

2017-03-08 11:02:20 +01:00

Core

Merge pull request #5065 from JosJuice/character

2017-03-11 18:26:26 +10: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

Common: Move byte swapping utilities into their own header

2017-03-03 17:18:18 -05: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

CMakeLists: Normalize whitespace

2017-03-01 14:53:23 -05:00

dolphin-emu.sln

Add the cpp-optparse project to Externals.

2017-02-16 14:09:13 +01:00