commit 64cdaabd292d54fe3637b4530eb610af2d46c647
Merge: e38b186c c2caed90
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Apr 17 02:23:33 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Apr 17 02:23:33 2014 -0400

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

 src/setup/mainmenu.c | 2 ++
 1 file changed, 2 insertions(+)