OpenTTD-patches/.github
Jonathan G Rennison a98a56669b Merge branch 'master' into jgrpp
# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
2024-02-19 23:11:00 +00:00
..
codeql
ISSUE_TEMPLATE
workflows Merge branch 'master' into jgrpp 2024-02-15 23:49:11 +00:00
changelog.sh
FUNDING.yml
PULL_REQUEST_TEMPLATE.md Doc: Update documentation how to make commit message (#12046) 2024-02-10 21:01:34 +01:00
script-missing-mode-enforcement.py
unused-strings.py