piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
e0ffdda26e
dolphin/Source/Core
History
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
..
AudioCommon Revert "mem_fun -> mem_fn." 2013-01-23 23:38:49 -05:00
Common Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae" 2013-01-24 16:11:07 +01:00
Core Revert "mem_fun -> mem_fn." 2013-01-23 23:38:49 -05:00
DiscIO Merge branch 'ES_LAUNCH' 2013-01-16 20:22:29 +11:00
DolphinWX Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
InputCommon Revert "mem_fun -> mem_fn." 2013-01-23 23:38:49 -05:00
VideoCommon Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00