mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-08 00:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'immediate-removal' into GLSL-master

Browse source 
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
This commit is contained in:
degasus 2013-01-24 16:58:28 +01:00
commit e0ffdda26e
338 changed files with 40275 additions and 44293 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/VideoCommon/Src/VideoConfig.h
View file

@ -133,7 +133,6 @@ struct VideoConfig
bool bZTPSpeedHack; // The Legend of Zelda: Twilight Princess
bool bUseBBox;
bool bEnablePixelLighting;
bool bEnablePerPixelDepth;
int iLog; // CONF_ bits
int iSaveTargetId; // TODO: Should be dropped