Remove setting "BlockMerging".

It isn't hooked up to anything anymore, and it isn't the sort of thing we
want users messing with anyway.
This commit is contained in:
magumagu
2015-02-11 19:50:48 -08:00
parent 0e0a196a1c
commit 49f223a211
5 changed files with 3 additions and 13 deletions

View File

@ -172,7 +172,6 @@ struct SCoreStartupParameter
bool bForceNTSCJ;
bool bHLE_BS2;
bool bEnableCheats;
bool bMergeBlocks;
bool bEnableMemcardSaving;
bool bDPL2Decoder;