diff options
| author | Simon Howard | 2011-02-20 22:29:52 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-02-20 22:29:52 +0000 |
| commit | 8bf9496eeb4b9b32f1863cd10765b31f80bb971c (patch) | |
| tree | 11df89ed68b0a70887ede46f95e2ffa09a7bcc2e /src/setup | |
| parent | 645e33ef2522d402cc11f7f5252abc27819c4d66 (diff) | |
| download | chocolate-doom-8bf9496eeb4b9b32f1863cd10765b31f80bb971c.tar.gz chocolate-doom-8bf9496eeb4b9b32f1863cd10765b31f80bb971c.tar.bz2 chocolate-doom-8bf9496eeb4b9b32f1863cd10765b31f80bb971c.zip | |
Looks like a merge error - oops.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2270
Diffstat (limited to 'src/setup')
| -rw-r--r-- | src/setup/keyboard.c | 6 |
1 files changed, 0 insertions, 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); |