nukeykt e6f53f7c30 Resolve merge issues ... # Conflicts: # GNUmakefile # platform/Windows/eduke32.sln # platform/Windows/props/build_common.props # source/audiolib/include/music.h # source/blood/src/blood.cpp # source/blood/src/gui.cpp # source/blood/src/mapedit.cpp # source/blood/src/sound.cpp # source/build/include/vfs.h # source/build/src/vfs.cpp		2019-10-24 19:48:11 +02:00
..
drivers.h	Further audiolib work... I think this is almost done!	2019-10-24 19:25:48 +02:00
fx_man.h	Add MIDI_GetDevice and use it so that the default driver value doesn't show as "Custom" in the menu	2019-10-24 19:44:22 +02:00
midifuncs.h	New files for audiolib	2019-10-24 19:22:49 +02:00
multivoc.h	Resolve merge issues	2019-10-24 19:48:11 +02:00
music.h	Resolve merge issues	2019-10-24 19:48:11 +02:00
sndcards.h	Further audiolib work... I think this is almost done!	2019-10-24 19:25:48 +02:00