Jonathan G Rennison af1150182a Merge branch 'master' into jgrpp ...

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-source.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/network/network_survey.cpp
#	src/network/network_survey.h
#	src/openttd.cpp
#	src/tests/CMakeLists.txt

2023-11-17 19:17:14 +00:00

..

emscripten

Add: [Emscripten] Support for bootstrapping

2023-08-31 12:59:12 +02:00

macosx

Merge branch 'master' into jgrpp

2023-09-12 20:06:47 +01:00

steam

Add: [Actions] Automatically upload releases to Steam (#8644)

2021-02-05 20:58:15 +01:00

windows

Fix: Ensure logo for Windows Store common assets package is named correctly

2023-02-07 09:23:44 +00:00