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 27c06f9737 Merge branch 'master' into jgrpp
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/disaster_vehicle.cpp
#	src/music/dmusic.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_spritegroup.h
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/saveload/saveload.cpp
#	src/saveload/settings_sl.cpp
#	src/settings_table.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/newgrf_debug_data.h
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/video/win32_v.cpp
4 days ago
..
CMakeLists.txt Change: Don't include midi file processing in dedicated server build. (#12632) 5 months ago
allegro_m.cpp Merge branch 'master' into jgrpp 5 months ago
allegro_m.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
bemidi.cpp Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
bemidi.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
cocoa_m.cpp Merge branch 'master' into jgrpp 5 months ago
cocoa_m.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
dmusic.cpp Merge branch 'master' into jgrpp 4 days ago
dmusic.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
extmidi.cpp Remove use of non-threadsafe strerror 3 months ago
extmidi.h Merge branch 'master' into jgrpp 5 months ago
fluidsynth.cpp Merge branch 'master' into jgrpp 5 months ago
fluidsynth.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
midi.h Codechange: rename byte to uint8_t (#12308) 6 months ago
midifile.cpp Merge branch 'master' into jgrpp 1 month ago
midifile.hpp Merge branch 'master' into jgrpp 5 months ago
music_driver.hpp Merge branch 'master' into jgrpp 5 months ago
null_m.cpp
null_m.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago
win32_m.cpp Merge branch 'master' into jgrpp 4 days ago
win32_m.h Codechange: Pass std::string_view from drivers instead of char *. 5 months ago