OpenTTD-patches/.github
Jonathan G Rennison 1bfd96c7f2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/fmt/core.h
#	src/command_type.h
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/landscape.cpp
#	src/network/network.cpp
#	src/newgrf_object.h
#	src/object_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/script/api/script_object.hpp
#	src/script/api/script_town.cpp
#	src/table/object_land.h
#	src/timetable_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
2023-01-15 19:28:37 +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-01-15 19:28:37 +00:00
changelog.sh Fix: [Actions] changelog assumed major.minor.patch versioning (#9482) 2021-08-15 14:14:13 +02:00
FUNDING.yml Add: [GitHub] sponsor button on github.com (#7700) 2019-08-31 21:20:24 +02:00
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