 Jonathan G Rennison
		
	
	5b7db9d849
	
	
	Merge branch 'master' into jgrpp
			Jonathan G Rennison
		
	
	5b7db9d849
	
	
	Merge branch 'master' into jgrpp
		
			
			# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
		
	
 
		2022-05-15 13:54:13 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2021-11-14 16:59:49 +01:00
		 
	
		
			
			
			
			
			
			2021-11-11 20:06:31 +01:00
		 
	
		
			
			
			
			
			
			2020-02-08 23:38:49 +01:00
		 
	
		
			
			
			
			
			
			2021-02-05 20:58:15 +01:00
		 
	
		
			
			
			
			
			
			2022-05-04 11:40:49 +01:00