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.

Jonathan G Rennison da282c3ecc Merge branch 'master' into jgrpp-beta ... # Conflicts: # .github/workflows/ci-build.yml # CMakeLists.txt # src/lang/finnish.txt # src/lang/french.txt # src/lang/korean.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/spanish.txt # src/misc_gui.cpp # src/newgrf.cpp		3 years ago
..
ci-build.yml	Merge branch 'master' into jgrpp-beta	3 years ago
preview_build.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	4 years ago
preview_label.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	4 years ago
preview_push.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	4 years ago
release.yml	Merge branch 'master' into jgrpp-beta	3 years ago