commit a915b13e0d0c612c12b8f54132ffa3189375dde5
Merge: dc8d6356 51d5fc29
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Apr 26 01:10:45 2015 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Apr 26 01:10:45 2015 -0400

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

 src/deh_io.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)