 Jonathan G Rennison
		
	
	1e9fb74451
	
	
	Merge branch 'master' into jgrpp
			Jonathan G Rennison
		
	
	1e9fb74451
	
	
	Merge branch 'master' into jgrpp
		
			
			# Conflicts:
#	.github/workflows/release-windows.yml
#	src/autoreplace_gui.cpp
#	src/cargotype.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/dropdown.cpp
#	src/dropdown_func.h
#	src/dropdown_type.h
#	src/game/game_gui.cpp
#	src/genworld.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/house.h
#	src/industry_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_type.h
#	src/newgrf_class_func.h
#	src/newgrf_house.cpp
#	src/newgrf_roadstop.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/screenshot_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/slider.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/survey.cpp
#	src/tile_map.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
		
	
 
		2024-05-28 20:33:35 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2023-02-07 09:23:44 +00:00
		 
	
		
			
			
			
			
			
			2020-06-05 19:36:05 +02:00
		 
	
		
			
			
			
			
			
			2020-06-05 19:36:05 +02:00
		 
	
		
			
			
			
			
			
			2020-06-05 19:36:05 +02:00
		 
	
		
			
			
			
			
			
			2023-12-02 23:11:00 +00:00
		 
	
		
			
			
			
			
			
			2024-03-19 23:12:36 +00:00
		 
	
		
			
			
			
			
			
			2024-03-19 23:12:36 +00:00