Christoph Oelckers 71cd4ef488 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # libraries/zmusic/zmusic/mididefs.h # libraries/zmusic/zmusic/zmusic.h		2020-01-02 08:45:48 +01:00
..
win32	- applied fast math flags to C and C++ files	2019-10-05 14:41:21 +03:00
music_cd.cpp	- rewrote the ZMusic interface so that it is free of C++ constructs.	2020-01-02 01:26:01 +01:00
music_midi.cpp	Merge branch 'master' of https://github.com/coelckers/gzdoom	2020-01-02 08:45:48 +01:00
music_stream.cpp	- rewrote the ZMusic interface so that it is free of C++ constructs.	2020-01-02 01:26:01 +01:00