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 88670a230f Merge branch 'master' into jgrpp ... # Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/base_media_base.h # src/base_media_func.h # src/build_vehicle_gui.cpp # src/dock_gui.cpp # src/main_gui.cpp # src/music_gui.cpp # src/network/network_chat_gui.cpp # src/network/network_content.cpp # src/newgrf.cpp # src/newgrf_roadstop.cpp # src/os/windows/string_uniscribe.h # src/os/windows/win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/strings.cpp # src/terraform_gui.cpp # src/tests/test_script_admin.cpp # src/tests/test_window_desc.cpp # src/timer/timer_game_calendar.h # src/vehicle.cpp # src/vehicle_base.h # src/viewport.cpp # src/widget_type.h # src/window.cpp # src/window_gui.h		6 months ago
..
ISSUE_TEMPLATE	Merge branch 'master' into jgrpp-beta	3 years ago
codeql	Codechange: [CodeQL] Disable CodeQL check on trivial switch statements (#10537)	1 year ago
workflows	Merge branch 'master' into jgrpp	6 months ago
FUNDING.yml	Add: [GitHub] sponsor button on github.com (#7700)	5 years ago
PULL_REQUEST_TEMPLATE.md	Doc: 'game_changelog.hpp' not 'gs_changelog.hpp' in GitHub PR template (#11147)	11 months ago
changelog.sh	Fix: [Actions] changelog assumed major.minor.patch versioning (#9482)	3 years ago
script-missing-mode-enforcement.py	Change: Allow GS access to ScriptGroup functions	1 year ago
unused-strings.py	Add: workflow and script for checking missing mode enforcements	1 year ago