commit 301a9f04282056141658dd122eb5a9725e0d5430
Merge: 4ae30764 62e23730
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Oct 29 18:51:37 2018 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Mon Oct 29 18:51:37 2018 -0400

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

 CMakeLists.txt     |  2 ++
 cmake/config.h.cin |  1 +
 src/CMakeLists.txt |  2 ++
 src/i_glob.c       | 37 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 41 insertions(+), 1 deletion(-)