commit f55a88fec2949c834aa6c4434f22fcaf717ee11d
Merge: 1b9e5c61 3ecb69e1
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Oct 26 03:38:26 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Oct 26 03:38:26 2014 -0400

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

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