Jonathan G Rennison
23b974fb39
Merge branch 'master' into jgrpp
# Conflicts:
# src/fontcache.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/font_win32.cpp
# src/strings.cpp
2022-10-03 20:32:26 +01:00
..
2022-10-03 20:32:26 +01:00
2021-06-26 20:28:05 +02:00
2022-08-27 22:34:28 +01:00
2021-10-08 18:11:02 +01:00
2022-05-15 13:54:13 +01:00
2022-05-03 21:03:30 +02:00
2021-06-26 20:28:05 +02:00
2022-05-15 13:54:13 +01:00
2021-04-11 14:26:00 +02:00
2022-05-15 13:54:13 +01:00
2022-05-15 13:54:13 +01:00
2021-06-26 20:28:05 +02:00
2021-06-17 20:22:57 +02:00
2022-05-15 13:54:13 +01:00
2022-05-15 13:54:13 +01:00
2022-05-15 13:54:13 +01:00