| commit | 5dea173a86af1ec463d872ab7a107178a46d35c8 | |
| author | Jonathan G Rennison <j.g.rennison@gmail.com> | |
| Wed, 20 Nov 2024 18:08:17 +0000 (20 18:08 +0000) | ||
| committer | Jonathan G Rennison <j.g.rennison@gmail.com> | |
| Wed, 20 Nov 2024 18:08:17 +0000 (20 18:08 +0000) | ||
| tree | b95629fcf5454db95d6e43859e6985d7649c866d | treesnapshot (tar.gz zip) |
| parent | 3c59edb96be716d192a8e8763a540c8acfeb9618 | commitdiff |
| parent | 1b6a6f1cd2f2f5d6a8ff1cd7a526c992b967d3f0 | commitdiff |
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/strings_internal.h
# src/town_kdtree.h
# src/train_cmd.cpp
# src/viewport.cpp
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/strings_internal.h
# src/town_kdtree.h
# src/train_cmd.cpp
# src/viewport.cpp
19 files changed: