commit 15cec0d05f33ad4696ada2f73bea309f30f273b2
Merge: 47434df8 68828570
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Wed Jul 22 10:06:58 2015 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Wed Jul 22 10:06:58 2015 -0400

    Merge pull request #589 from Azarien/upstream_master

    VS2015 compilation fix

 src/doomtype.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)