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 fe730bce31 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/codeql.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # src/map.cpp # src/music/midifile.hpp # src/order_cmd.cpp # src/order_gui.cpp # src/pathfinder/yapf/yapf_rail.cpp # src/pbs.cpp # src/saveload/afterload.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/script/api/script_text.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_func.h # src/vehicle_gui.cpp # src/vehicle_gui_base.h # src/viewport.cpp # src/waypoint_cmd.cpp		2 months ago
..
CMakeLists.txt	Remove: OS/2 port	11 months ago
allegro_m.cpp	Merge branch 'master' into jgrpp	5 months ago
allegro_m.h	…
bemidi.cpp	…
bemidi.h	…
cocoa_m.cpp	Merge branch 'master' into jgrpp	5 months ago
cocoa_m.h	…
dmusic.cpp	Windows: Avoid destruction of unjoined std::thread on ExitProcess	3 months ago
dmusic.h	…
extmidi.cpp	Merge tag '14.0-beta1' into jgrpp	2 months ago
extmidi.h	Merge branch 'master' into jgrpp	8 months ago
fluidsynth.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
fluidsynth.h	…
midi.h	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
midifile.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
midifile.hpp	Merge branch 'master' into jgrpp	2 months ago
music_driver.hpp	Merge branch 'master' into jgrpp	5 months ago
null_m.cpp	…
null_m.h	Codechange: Silence warnings about intentionally unused parameters.	7 months ago
win32_m.cpp	Merge branch 'master' into jgrpp	3 months ago
win32_m.h	…