Merge branch 'master' into jgrpp-beta

Browse Source

# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h

...

This commit is contained in:

Jonathan G Rennison

2021-11-02 19:23:24 +00:00

parent 9e1bb3eea7 7469f00c5b

commit 324e90e5ac

99 changed files with 1632 additions and 1336 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

media/openttd.1024.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 66 KiB

BIN

media/openttd.2048.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 148 KiB

BIN

media/openttd.512.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 31 KiB