Jonathan G Rennison edfa04286b Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/release.yml # bin/CMakeLists.txt # src/dock_gui.cpp # src/lang/brazilian_portuguese.txt # src/lang/catalan.txt # src/lang/czech.txt # src/lang/dutch.txt # src/lang/english.txt # src/lang/english_US.txt # src/lang/estonian.txt # src/lang/finnish.txt # src/lang/french.txt # src/lang/german.txt # src/lang/hungarian.txt # src/lang/indonesian.txt # src/lang/italian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/lithuanian.txt # src/lang/luxembourgish.txt # src/lang/norwegian_bokmal.txt # src/lang/polish.txt # src/lang/portuguese.txt # src/lang/romanian.txt # src/lang/russian.txt # src/lang/serbian.txt # src/lang/simplified_chinese.txt # src/lang/slovak.txt # src/lang/spanish.txt # src/lang/spanish_MX.txt # src/lang/swedish.txt # src/lang/tamil.txt # src/lang/ukrainian.txt # src/lang/vietnamese.txt # src/newgrf.cpp # src/newgrf_gui.cpp # src/object_gui.cpp # src/pathfinder/yapf/yapf_costrail.hpp # src/pathfinder/yapf/yapf_node_rail.hpp # src/rail_cmd.cpp # src/roadveh_cmd.cpp # src/town_cmd.cpp # src/vehicle.cpp # src/water_cmd.cpp		2021-04-11 02:39:33 +01:00
..
workflows	Merge branch 'master' into jgrpp	2021-04-11 02:39:33 +01: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