Merge branch 'save_ext' into enhanced_viewport_overlay

# Conflicts: # src/industry_cmd.cpp # src/vehicle.cpp
2018-03-11 22:16:19 +00:00
parent 2574e46df8 16c67ea484
commit 864d94d2c5
155 changed files with 7373 additions and 1175 deletions
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -398,6 +398,7 @@ static const char * const _credits[] = {
 	"Original graphics by Simon Foster",
 	"",
 	"The OpenTTD team (in alphabetical order):",
+	"  Grzegorz Duczy\xC5\x84ski (adf88) - General coding (since 1.7.2)",
 	"  Albert Hofkamp (Alberth) - GUI expert (since 0.7)",
 	"  Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)",
 	"  Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)",