You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison ed1b842ad3 Merge branch 'master' into jgrpp ... # Conflicts: # src/console.cpp # src/console_func.h # src/network/network_server.cpp # src/os/unix/unix.cpp # src/spritecache.cpp # src/viewport.cpp		9 months ago
..
CMakeLists.txt	Remove: OS/2 port	12 months ago
allegro_m.cpp	Codechange: convert printf DEBUG statements to fmt Debug statements	3 years ago
allegro_m.h	…
bemidi.cpp	Fix: Workarounds for BeMidi driver to work properly on Haiku	3 years ago
bemidi.h	Fix: Workarounds for BeMidi driver to work properly on Haiku	3 years ago
cocoa_m.cpp	Codechange: convert printf DEBUG statements to fmt Debug statements	3 years ago
cocoa_m.h	…
dmusic.cpp	Codechange: convert printf DEBUG statements to fmt Debug statements	3 years ago
dmusic.h	…
extmidi.cpp	Merge branch 'master' into jgrpp	9 months ago
extmidi.h	Merge branch 'master' into jgrpp	9 months ago
fluidsynth.cpp	Fix build issues on MinGW	3 years ago
fluidsynth.h	…
midi.h	…
midifile.cpp	Merge branch 'master' into jgrpp	9 months ago
midifile.hpp	Merge branch 'master' into jgrpp	11 months ago
music_driver.hpp	Music: Defer probing for music driver until a music set is loaded	10 months ago
null_m.cpp	…
null_m.h	…
win32_m.cpp	Merge branch 'master' into jgrpp	11 months ago
win32_m.h	…