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

# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp

2024-06-10 22:38:23 +01:00

..

macosx

Merge branch 'master' into jgrpp

2024-06-10 22:38:23 +01:00

unix

Merge branch 'master' into jgrpp

2024-06-10 22:38:23 +01:00

windows

Merge branch 'master' into jgrpp

2024-06-10 22:38:23 +01:00

CMakeLists.txt

Remove: OS/2 port

2023-06-16 14:29:14 +01:00