Merge branch 'master' into minmod
This commit is contained in:
commit
11e492c897
29 changed files with 2369 additions and 401 deletions
|
|
@ -3551,6 +3551,7 @@ void FurnaceGUI::drawSettings() {
|
|||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_POWERNOISE,"PowerNoise (noise)");
|
||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_POWERNOISE_SLOPE,"PowerNoise (slope)");
|
||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_DAVE,"Dave");
|
||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_NDS,"NDS");
|
||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_GBA_DMA,"GBA DMA");
|
||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_GBA_MINMOD,"GBA MinMod");
|
||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UNKNOWN,"Other/Unknown");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue