You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 75dd135e8d 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		3 months ago
..
core	Merge tag '14.0-beta3' into jgrpp	3 months ago
CMakeLists.txt	Network: Extend post-desync frame sync history	9 months ago
network.cpp	Split date types into calendar and economy dates	4 months ago
network.h	…
network_admin.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_admin.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_base.h	Split date types into calendar and economy dates	4 months ago
network_chat_gui.cpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
network_client.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_client.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_command.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_content.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_content.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_content_gui.cpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
network_content_gui.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_coordinator.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_coordinator.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_func.h	Split date types into calendar and economy dates	4 months ago
network_gamelist.cpp	Codechange: make the MD5 hash/digest/checksum variables a std::array	1 year ago
network_gamelist.h	Codechange: workaround CMake/Xcode duplicate file name issue (#11186)	9 months ago
network_gui.cpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
network_gui.h	Split date types into calendar and economy dates	4 months ago
network_internal.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_query.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_query.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_server.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_server.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_stun.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_stun.h	Merge branch 'master' into jgrpp	4 months ago
network_survey.cpp	Merge branch 'master' into jgrpp	4 months ago
network_survey.h	Merge branch 'master' into jgrpp	5 months ago
network_sync.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_turn.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_turn.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_type.h	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_udp.cpp	Merge tag '14.0-beta3' into jgrpp	3 months ago
network_udp.h	…