commit b19ba33766b80c7b216692f03839fcc23ef36ac0
Merge: 72ce4242 28c1aa1b
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun May 11 00:19:21 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun May 11 00:19:21 2014 -0400

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

 src/setup/mode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)