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 c5b3c18bb5 Merge branch 'master' into jgrpp ... # Conflicts: # src/company_func.h # src/core/overflowsafe_type.hpp # src/engine.cpp # src/music/midifile.cpp # src/network/network_command.cpp # src/newgrf_debug_gui.cpp # src/newgrf_roadstop.h # src/newgrf_spritegroup.cpp # src/os/macosx/crashlog_osx.cpp # src/os/unix/crashlog_unix.cpp # src/pathfinder/yapf/yapf_common.hpp # src/road_gui.cpp # src/saveload/engine_sl.cpp # src/settings_gui.cpp # src/settings_type.h # src/strings.cpp # src/table/settings/game_settings.ini		5 months ago
..
CMakeLists.txt	Remove: OS/2 port	12 months ago
allegro_m.cpp	Merge branch 'master' into jgrpp	6 months 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	Merge branch 'master' into jgrpp	6 months ago
cocoa_m.h	…
dmusic.cpp	Merge branch 'master' into jgrpp	5 months ago
dmusic.h	…
extmidi.cpp	Merge branch 'master' into jgrpp	6 months ago
extmidi.h	Merge branch 'master' into jgrpp	9 months ago
fluidsynth.cpp	MinGW: Remove direct mingw-std-threads includes	6 months ago
fluidsynth.h	…
midi.h	Merge branch 'master' into jgrpp	6 months ago
midifile.cpp	Merge branch 'master' into jgrpp	5 months ago
midifile.hpp	Merge branch 'master' into jgrpp	6 months ago
music_driver.hpp	Merge branch 'master' into jgrpp	6 months ago
null_m.cpp	…
null_m.h	Codechange: Silence warnings about intentionally unused parameters.	9 months ago
win32_m.cpp	MinGW: Remove direct mingw-std-threads includes	6 months ago
win32_m.h	…