OpenTTD-patches/.github
Jonathan G Rennison 2ea1766677 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
2023-03-04 16:45:05 +00:00
..
codeql Add: enable CodeQL code scanning 2023-01-14 21:58:18 +01:00
ISSUE_TEMPLATE Merge branch 'master' into jgrpp-beta 2021-11-01 18:54:43 +00:00
workflows Merge branch 'master' into jgrpp 2023-03-04 16:45:05 +00:00
changelog.sh Fix: [Actions] changelog assumed major.minor.patch versioning (#9482) 2021-08-15 14:14:13 +02:00
FUNDING.yml
PULL_REQUEST_TEMPLATE.md Doc: guidelines on english.txt or translation changes in PRs. (#9505) 2021-08-22 14:27:48 +02:00
unused-strings.py Codechange: validate that all STR_NNN strings are defined and used (#9518) 2021-09-02 22:32:10 +02:00