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.
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
3 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 3 months ago
FUNDING.yml Add: [GitHub] sponsor button on github.com (#7700) 5 years ago
PULL_REQUEST_TEMPLATE.md Doc: Update documentation how to make commit message (#12046) 3 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