OpenTTD-patches/.github
Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
2021-02-01 18:58:36 +00:00
..
workflows Merge tag '1.11.0-beta1' into jgrpp 2021-02-01 18:58:36 +00:00
changelog.sh Add: [Actions] release workflow for both releases and nightlies 2020-12-19 18:26:29 +01:00
FUNDING.yml Add: [GitHub] sponsor button on github.com (#7700) 2019-08-31 21:20:24 +02:00
ISSUE_TEMPLATE.md Add: [GitHub] Add issue template to encourage better issue reporting. (#7137) 2019-01-29 18:15:54 +01:00
PULL_REQUEST_TEMPLATE.md Fix: add missing variables to NewGRF inspect window. 2021-01-10 21:24:38 +01:00
stale.yml Add: [GitHub] enable probot/stale, to flush out stale issues/pull requests 2019-01-24 21:57:06 +01:00