foxygit / doom Log in
commit 8bf9496eeb4b9b32f1863cd10765b31f80bb971c
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Feb 20 22:29:52 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Feb 20 22:29:52 2011 +0000

    Looks like a merge error - oops.

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 2270
---
 src/setup/keyboard.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c
index 3d9f9977..a128b3ab 100644
--- a/src/setup/keyboard.c
+++ b/src/setup/keyboard.c
@@ -294,12 +294,6 @@ static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
     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);