shithub: choc

Info  •  Files  •  Log  •  Branches

Looks like a merge error - oops.

Subversion-branch: /branches/raven-branch
Subversion-revision: 2270

--- a/src/setup/keyboard.c

+++ b/src/setup/keyboard.c

@@ -294,12 +294,6 @@

     AddKeyControl(table, "- to brown",            &key_multi_msgplayer[2]);

     AddKeyControl(table, "- to red",              &key_multi_msgplayer[3]);

-    TXT_AddWidgets(table, TXT_NewStrut(0, 1),

-                          TXT_NewStrut(0, 1),

-                          TXT_NewLabel(" - Map - "),

-                          TXT_NewStrut(0, 0),

-                          NULL);

-

     scrollpane = TXT_NewScrollPane(0, 13, table);

     TXT_AddWidget(window, scrollpane);