Merge remote-tracking branch 'upstream/1.11' into 1.11

2021-04-01 17:33:31 +03:00
parent 14f71187eb ec1f91e865
commit 93d8111960
125 changed files with 2828 additions and 1149 deletions
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -514,6 +514,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"  Chrnan6710 - title game",
 	u8"",
 	u8"  Alberto Demichelis - Squirrel scripting language \u00a9 2003-2008",
 	u8"  L. Peter Deutsch - MD5 implementation \u00a9 1999, 2000, 2002",