commit 0677af31ce73cb0356551b0639e24b1df35836dd
Merge: 21a41318 3608dddd
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Tue Oct 21 01:00:32 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Tue Oct 21 01:00:32 2014 -0400

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 src/doom/d_main.c | 13 +++++++++++++
 src/doom/m_menu.c | 26 +++-----------------------
 2 files changed, 16 insertions(+), 23 deletions(-)