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 f4e29071be Merge tag '1.11.0-beta2' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/debug.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/lang/czech.txt
#	src/lang/english.txt
#	src/lang/italian.txt
#	src/lang/swedish.txt
#	src/lang/ukrainian.txt
#	src/network/network_server.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/follow_track.hpp
#	src/screenshot.cpp
#	src/settings_type.h
#	src/spritecache.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/video_driver.cpp
#	src/video/video_driver.hpp
#	src/video/win32_v.cpp
3 years ago
..
CMakeLists.txt Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
allegro_m.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
allegro_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
bemidi.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
bemidi.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
cocoa_m.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
cocoa_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
dmusic.cpp Merge tag '1.11.0-beta2' into jgrpp 3 years ago
dmusic.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
extmidi.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
extmidi.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
fluidsynth.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
fluidsynth.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
midi.h Cleanup: Removed SVN headers 5 years ago
midifile.cpp Codechange: Remove min/max functions in favour of STL variants (#8502) 4 years ago
midifile.hpp Cleanup: Removed SVN headers 5 years ago
music_driver.hpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
null_m.cpp Cleanup: Removed SVN headers 5 years ago
null_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
os2_m.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
os2_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
win32_m.cpp Merge branch 'master' into jgrpp 3 years ago
win32_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago