commit 974692ac456d003a3da3f21b9fb0d4400d62ee77
Merge: 7d8526e3 624e4b2f
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Thu Mar 20 10:23:49 2014 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Thu Mar 20 10:23:49 2014 -0400

    Merge pull request #364 from fabiangreffrath/key_screenshot

    Add a dedicated key for taking screenshots.

 src/doom/m_menu.c     | 3 ++-
 src/heretic/mn_menu.c | 3 ++-
 src/hexen/mn_menu.c   | 3 ++-
 src/m_config.c        | 6 ++++++
 src/m_controls.c      | 2 ++
 src/m_controls.h      | 1 +
 src/setup/keyboard.c  | 2 ++
 src/strife/m_menu.c   | 5 +++++
 8 files changed, 22 insertions(+), 3 deletions(-)