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.
OpenTTD-patches/src/music
Jonathan G Rennison ead18b2af2 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
11 months ago
..
CMakeLists.txt Fix: Building on Haiku 3 years 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 extmidi: Do not continuously retry if execvp fails 1 year ago
extmidi.h extmidi: Do not continuously retry if execvp fails 1 year ago
fluidsynth.cpp Fix build issues on MinGW 3 years ago
fluidsynth.h
midi.h
midifile.cpp Merge branch 'master' into jgrpp 11 months ago
midifile.hpp Merge branch 'master' into jgrpp 11 months ago
music_driver.hpp extmidi: Do not continuously retry if execvp fails 1 year ago
null_m.cpp
null_m.h
os2_m.cpp Codechange: stdarg.h include not needed as cstdarg is included. 1 year ago
os2_m.h
win32_m.cpp Merge branch 'master' into jgrpp 11 months ago
win32_m.h