Merge tag '14.0-beta3' into jgrpp
# Conflicts: # regression/regression/result.txt # src/industrytype.h # src/network/core/config.h # src/network/core/network_game_info.cpp # src/network/core/network_game_info.h # src/network/core/packet.cpp # src/network/core/packet.h # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_admin.cpp # src/network/core/tcp_content.cpp # src/network/core/tcp_coordinator.cpp # src/network/core/tcp_game.cpp # src/network/core/tcp_game.h # src/network/core/tcp_turn.cpp # src/network/core/udp.cpp # src/network/core/udp.h # src/network/network_admin.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_command.cpp # src/network/network_content.cpp # src/network/network_internal.h # src/network/network_query.cpp # src/network/network_query.h # src/network/network_server.cpp # src/network/network_server.h # src/network/network_turn.cpp # src/network/network_udp.cpp # src/rail_gui.cpp # src/road_gui.cpp
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -3,4 +3,4 @@
|
||||
The OpenTTD TrueType font was created by Zephyris and is maintained on [Github](https://github.com/zephyris/openttd-ttf).
|
||||
It is licensed under GPL-2.0.
|
||||
|
||||
The currently included files correspond to release v0.4.
|
||||
The currently included files correspond to release v0.5.
|
||||
|
||||
Reference in New Issue
Block a user