Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
b38321b9b4
OpenTTD-patches/src/music
History
Jonathan G Rennison fdd666f66a Merge tag '14.0-beta1' into jgrpp 
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
2024-02-18 22:22:29 +00:00
..
allegro_m.cpp
allegro_m.h
bemidi.cpp
bemidi.h
CMakeLists.txt
cocoa_m.cpp
cocoa_m.h
dmusic.cpp Windows: Avoid destruction of unjoined std::thread on ExitProcess 2024-02-11 02:03:33 +00:00
dmusic.h
extmidi.cpp Merge tag '14.0-beta1' into jgrpp 2024-02-18 22:22:29 +00:00
extmidi.h
fluidsynth.cpp Adding of _t to (u)int types, and WChar to char32_t 2024-01-07 17:20:41 +00:00
fluidsynth.h
midi.h Adding of _t to (u)int types, and WChar to char32_t 2024-01-07 17:20:41 +00:00
midifile.cpp Adding of _t to (u)int types, and WChar to char32_t 2024-01-07 17:20:41 +00:00
midifile.hpp Adding of _t to (u)int types, and WChar to char32_t 2024-01-07 17:20:41 +00:00
music_driver.hpp
null_m.cpp
null_m.h
win32_m.cpp Merge branch 'master' into jgrpp 2024-01-25 22:36:01 +00:00
win32_m.h