degasus fed574d08b solve merge conflict

2013-02-18 18:55:42 +01:00

..

AudioCommon

Fix the majority of the compiler warnings unearthed by the addition of

2013-01-29 23:24:51 -06:00

Common

Merge branch 'master' into GLSL-master

2013-02-18 18:49:20 +01:00

Core

WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation.

2013-02-17 13:52:04 -06:00

DiscIO

Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin.

2013-02-17 01:57:25 -06:00

DolphinWX

solve merge conflict

2013-02-18 18:55:42 +01:00

InputCommon

Clean up SDL includes a bit. Maybe fix an SDL2 problem.

2013-02-12 14:02:43 -06:00

VideoCommon

Merge branch 'master' into GLSL-master

2013-02-18 18:49:20 +01:00

CMakeLists.txt

…