Merge tag '12.1' into branch 12

2021-12-10 02:36:38 +02:00
parent 9b2e51b755 17dfc6e28a
commit 793444e1ba
85 changed files with 2391 additions and 637 deletions
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -465,6 +465,7 @@ static const char * const _credits[] = {
 	u8"  Mike Ragsdale - OpenTTD installer",
 	u8"  Christian Rosentreter (tokai) - MorphOS / AmigaOS port",
 	u8"  Richard Kempton (richK) - additional airports, initial TGP implementation",
+	u8"  Plus C - title game",
 	u8"",
 	u8"  Alberto Demichelis - Squirrel scripting language \u00a9 2003-2008",
 	u8"  L. Peter Deutsch - MD5 implementation \u00a9 1999, 2000, 2002",