commit 670212f2ee7c468790c3e3b351b45135c274ef9c
Merge: 6a299e2f 3c44a45b
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon May 4 11:28:51 2020 -0400
Commit:     GitHub <noreply@github.com>
CommitDate: Mon May 4 11:28:51 2020 -0400

    Merge pull request #1280 from chocolate-doom/fluidsynth-fix

    music: Disable Fluidsynth when we want Timidity.

 src/i_sdlmusic.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)