mirror of https://github.com/stella-emu/stella.git
fixed merge bug (fixes #758)
This commit is contained in:
parent
0a0b014c13
commit
1bb126b06a
src/gui
|
@ -283,7 +283,7 @@ void GameInfoDialog::addControllersTab()
|
|||
VarList::push_back(items, "KidVid", "KIDVID");
|
||||
VarList::push_back(items, "Lightgun", "LIGHTGUN");
|
||||
VarList::push_back(items, "MindLink", "MINDLINK");
|
||||
VarList::push_back(ctrls, "QuadTari", "QUADTARI");
|
||||
VarList::push_back(items, "QuadTari", "QUADTARI");
|
||||
|
||||
xpos = HBORDER; ypos = VBORDER;
|
||||
pwidth = _font.getStringWidth("Paddles_IAxis");
|
||||
|
|
Loading…
Reference in New Issue