 Jonathan G Rennison
		
	
	75dd135e8d
	
	
	Merge tag '14.0-beta3' into jgrpp
			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
		
	
 
		2024-02-19 17:57:05 +00:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2024-02-19 17:57:05 +00:00
		 
	
		
			
			
			
			
			
			2021-03-09 22:42:25 +01:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2006-08-13 08:18:11 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2005-05-28 10:32:09 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2005-01-22 23:57:03 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2021-08-31 10:25:51 +02:00
		 
	
		
			
			
			
			
			
			2021-08-31 10:25:51 +02:00
		 
	
		
			
			
			
			
			
			2021-08-31 10:25:51 +02:00
		 
	
		
			
			
			
			
			
			2023-08-08 22:20:57 +02:00
		 
	
		
			
			
			
			
			
			2009-12-28 19:26:44 +00:00