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 fd605e3cf3 Merge branch 'master' into jgrpp-beta ... # Conflicts: # .github/workflows/commit-checker.yml # src/company_cmd.cpp # src/console_cmds.cpp # src/crashlog.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/swedish.txt # src/linkgraph/linkgraphjob.cpp # src/linkgraph/mcf.cpp # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_game.h # src/network/core/udp.h # src/network/network.cpp # src/network/network_admin.cpp # src/network/network_admin.h # src/network/network_chat_gui.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_func.h # src/network/network_internal.h # src/network/network_server.cpp # src/network/network_server.h # src/newgrf.cpp # src/newgrf_station.cpp # src/order_gui.cpp # src/rail_cmd.cpp # src/saveload/saveload.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_type.h # src/station_cmd.cpp # src/stdafx.h # src/table/currency_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble # src/table/settings.ini # src/terraform_cmd.cpp # src/timetable_gui.cpp # src/train_cmd.cpp # src/tree_cmd.cpp # src/water_cmd.cpp		3 years ago
..
CMakeLists.txt	Fix: Building on Haiku	3 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	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	Fix #8713: Change OTTD2FS and FS2OTTD to return string objects instead of static buffers	3 years ago
cocoa_m.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
dmusic.cpp	Merge branch 'master' 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	Fix build issues on MinGW	3 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: Use std::string in console commands/aliases registration, and std::map instead our sorted linked list (#9057)	3 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