 Jonathan G Rennison
		
	
	f9b75ed304
	
	
	Merge branch 'master' into jgrpp
			Jonathan G Rennison
		
	
	f9b75ed304
	
	
	Merge branch 'master' into jgrpp
		
			
			# Conflicts:
#	cmake/scripts/FindVersion.cmake
#	src/airport_gui.cpp
#	src/industry_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_class_func.h
#	src/newgrf_object.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/object_gui.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/station_cmd.h
#	src/strings.cpp
#	src/waypoint_cmd.h
		
	
 
		2024-06-05 21:13:55 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2023-11-26 15:59:41 +00:00
		 
	
		
			
			
			
			
			
			2023-12-06 13:30:47 +01:00
		 
	
		
			
			
			
			
			
			2021-03-09 22:42:25 +01:00
		 
	
		
			
			
			
			
			
			2024-06-05 21:13:55 +01:00
		 
	
		
			
			
			
			
			
			2024-03-16 23:43:20 +01:00
		 
	
		
			
			
			
			
			
			2024-02-10 14:16:24 +01:00
		 
	
		
			
			
			
			
			
			2024-01-05 19:17:08 +01:00
		 
	
		
			
			
			
			
			
			2022-05-01 00:39:59 +02:00