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 faf32200cf Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
3 years ago
..
ISSUE_TEMPLATE Merge branch 'master' into jgrpp-beta 3 years ago
workflows Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
FUNDING.yml Add: [GitHub] sponsor button on github.com (#7700) 5 years ago
PULL_REQUEST_TEMPLATE.md Fix: add missing variables to NewGRF inspect window. 3 years ago
changelog.sh Add: [Actions] release workflow for both releases and nightlies 4 years ago
stale.yml Add: [GitHub] enable probot/stale, to flush out stale issues/pull requests 5 years ago