Rachael Alexanderson 3967afa551 Merge ../qzdoom ... # Conflicts: # src/oplsynth/dosbox/opl.cpp # src/oplsynth/mlopl.cpp # src/oplsynth/mlopl_io.cpp # src/oplsynth/music_opl_mididevice.cpp # src/oplsynth/music_opldumper_mididevice.cpp # src/oplsynth/muslib.h # src/oplsynth/nukedopl3.h # src/oplsynth/opl_mus_player.cpp # src/sound/fmodsound.cpp # src/sound/fmodsound.h		2017-03-08 21:36:58 -05:00
..
static	Merge ../qzdoom	2017-03-08 21:36:58 -05:00
CMakeLists.txt	- fixed: rename qzdoom.pk3 gzdoom.pk3	2017-03-06 23:09:49 -05:00