Jonathan G Rennison
		
	
	c1df63a2eb
	
	
	Merge branch 'master' into jgrpp
		
			
			# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
		
	
 
		2018-11-19 20:51:16 +00:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2018-04-27 00:33:44 +01:00
		 
	
		
			
			
			
			
			
			2017-03-13 21:56:38 +00:00
		 
	
		
			
			
			
			
			
			2017-08-24 14:50:55 +00:00
		 
	
		
			
			
			
			
			
			2018-11-18 19:51:51 +01:00
		 
	
		
			
			
			
			
			
			2018-11-18 19:51:51 +01:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2018-11-18 19:51:51 +01:00
		 
	
		
			
			
			
			
			
			2018-04-29 21:30:45 +02:00
		 
	
		
			
			
			
			
			
			2018-04-29 21:30:45 +02:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 17:38:03 +00:00
		 
	
		
			
			
			
			
			
			2018-04-29 21:30:45 +02:00
		 
	
		
			
			
			
			
			
			2018-04-29 21:30:45 +02:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 17:38:03 +00:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2018-07-24 18:30:42 +01:00
		 
	
		
			
			
			
			
			
			2018-07-24 18:30:42 +01:00
		 
	
		
			
			
			
			
			
			2018-04-21 11:05:38 +02:00
		 
	
		
			
			
			
			
			
			2018-06-25 18:39:59 +01:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2018-07-24 18:30:42 +01:00
		 
	
		
			
			
			
			
			
			2018-07-24 18:30:42 +01:00
		 
	
		
			
			
			
			
			
			2018-04-21 11:05:38 +02:00
		 
	
		
			
			
			
			
			
			2018-06-25 18:39:59 +01:00
		 
	
		
			
			
			
			
			
			2018-04-10 21:07:27 +02:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2018-11-18 19:51:51 +01:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2018-11-18 19:51:51 +01:00
		 
	
		
			
			
			
			
			
			2015-08-10 20:36:57 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00
		 
	
		
			
			
			
			
			
			2018-11-18 19:51:51 +01:00
		 
	
		
			
			
			
			
			
			2017-09-24 16:19:29 +00:00