ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Core
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
..
AudioCommon Fix a bunch of random typos in comments and logging. 2013-04-19 09:21:45 -04:00
Common Merge branch 'dspjit' 2013-04-21 12:29:18 +02:00
Core Back to broken ES_launch but 4 wiimotes working. 2013-04-25 15:28:42 +12:00
DiscIO Fix a bunch of random typos in comments and logging. 2013-04-19 09:21:45 -04:00
DolphinWX Generally make the Android UI better. 2013-04-23 14:27:49 -05:00
InputCommon Fix a bunch of random typos in comments and logging. 2013-04-19 09:21:45 -04:00
VideoCommon Merge 'master' into shader-uids-awesome. 2013-04-25 14:05:54 +02:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00