Christoph Oelckers 4c0f68bcd4 Merge branch 'master' into timidity++ ... # Conflicts: # src/sound/musicformats/music_midistream.cpp		2018-03-02 00:08:12 +01:00
..
static	Merge branch 'master' into timidity++	2018-03-02 00:08:12 +01:00
CMakeLists.txt	- missed one qzdoom reference	2017-07-20 06:45:08 -04:00