commit 6cbe5972d39b882a0fc8e5ddfc83b3f72a8b7031
Merge: af1dd2eb 9aa36cf8
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Nov 1 20:54:46 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sat Nov 1 20:54:46 2014 -0400

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

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