Merge branch 'master' into jgrpp

Browse Source

# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h

...

This commit is contained in:

Jonathan G Rennison

2021-04-25 22:03:49 +01:00

parent 66fda55ec4 5afb090082

commit 8eb27e1ac7

98 changed files with 1370 additions and 1193 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

1037

src/network/network_gui.cpp

File diff suppressed because it is too large Load Diff