doom · commit

commit 2b6357b106899d01c3d058e9f9cbfe370ca5b6cd
Merge: dc22bb70 ff0ef58b
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Mon Sep 2 21:06:38 2019 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Mon Sep 2 21:06:38 2019 +0200

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

 src/i_midipipe.c          | 2 --
 textscreen/fonts/large.h  | 2 +-
 textscreen/fonts/normal.h | 2 +-
 textscreen/fonts/small.h  | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)