Jonathan G Rennison
		
	
	6740a9a470
	
	
	Merge branch 'custom_bridgeheads' into jgrpp
		
			
			# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
		
	
 
		2018-07-08 23:04:30 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2010-08-14 14:50:06 +00:00
		 
	
		
			
			
			
			
			
			2013-07-13 09:59:09 +00:00
		 
	
		
			
			
			
			
			
			2014-09-07 14:21:16 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2006-03-29 16:30:26 +00:00
		 
	
		
			
			
			
			
			
			2011-01-16 13:36:47 +00:00
		 
	
		
			
			
			
			
			
			2010-08-27 10:42:48 +00:00
		 
	
		
			
			
			
			
			
			2018-07-08 23:04:30 +01:00
		 
	
		
			
			
			
			
			
			2018-07-08 23:04:30 +01:00
		 
	
		
			
			
			
			
			
			2013-06-09 12:52:50 +00:00
		 
	
		
			
			
			
			
			
			2011-02-16 21:10:13 +00:00
		 
	
		
			
			
			
			
			
			2011-10-04 21:35:47 +00:00
		 
	
		
			
			
			
			
			
			2018-06-05 22:58:35 +02:00
		 
	
		
			
			
			
			
			
			2009-10-22 16:01:28 +00:00
		 
	
		
			
			
			
			
			
			2014-12-24 16:53:04 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2007-06-24 20:41:24 +00:00
		 
	
		
			
			
			
			
			
			2018-06-05 22:58:35 +02:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00