dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-23 06:57:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5e6b712651
dolphin/Source
History
NeoBrainX 5e6b712651 Merge 'master' into shader-uids-awesome. 
Conflicts:
	Source/Core/VideoCommon/Src/BPMemory.h
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
2013-04-25 14:05:54 +02:00
..
Android Change Android project name to dolphin emulator 2013-04-24 09:00:14 -05:00
Core Merge 'master' into shader-uids-awesome. 2013-04-25 14:05:54 +02:00
DSPSpy
DSPTool New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. 2013-04-17 23:09:55 -04:00
Plugins Merge 'master' into shader-uids-awesome. 2013-04-25 14:05:54 +02:00
TestSuite clear cg from project files 2013-02-27 10:55:25 +01:00
UnitTests
VSProps clear cg from project files 2013-02-27 10:55:25 +01:00
CMakeLists.txt
Dolphin_2010.sln