Merge branch 'master' into jgrpp-beta
# Conflicts: # src/network/core/game_info.h # src/network/core/udp.cpp # src/network/core/udp.h # src/network/network.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_internal.h # src/network/network_udp.cpp
This commit is contained in:
@@ -22,8 +22,8 @@
|
||||
#include "../gfx_type.h"
|
||||
#include "../openttd.h"
|
||||
#include "../company_type.h"
|
||||
#include "../string_type.h"
|
||||
|
||||
extern NetworkServerGameInfo _network_game_info;
|
||||
extern NetworkCompanyState *_network_company_states;
|
||||
|
||||
extern ClientID _network_own_client_id;
|
||||
|
Reference in New Issue
Block a user