Jonathan G Rennison
		
	
	fc1c47cbd2
	
	
	Merge branch 'master' into jgrpp
		
			
			# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/crashlog.h
#	src/date_type.h
#	src/depot_type.h
#	src/landscape.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/script/api/script_infrastructure.cpp
#	src/stdafx.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/pathfinding_settings.ini
#	src/tests/CMakeLists.txt
		
	
 
		2023-11-13 19:08:22 +00:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2021-01-22 10:26:45 +01:00
		 
	
		
			
			
			
			
			
			2020-06-27 18:21:17 +02:00
		 
	
		
			
			
			
			
			
			2021-04-24 13:19:13 +02:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:41:17 +01:00
		 
	
		
			
			
			
			
			
			2019-11-13 20:40:18 +01:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:12:54 +01:00
		 
	
		
			
			
			
			
			
			2023-08-15 22:21:13 +02:00
		 
	
		
			
			
			
			
			
			2021-08-22 14:27:48 +02: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
		 
	
		
			
			
			
			
			
			2021-07-20 19:57:23 +02:00
		 
	
		
			
			
			
			
			
			2023-09-03 20:58:25 +01:00
		 
	
		
			
			
			
			
			
			2010-08-27 10:42:48 +00:00
		 
	
		
			
			
			
			
			
			2023-09-30 12:39:09 +01:00
		 
	
		
			
			
			
			
			
			2023-09-30 12:39:09 +01:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:12:54 +01:00
		 
	
		
			
			
			
			
			
			2020-01-26 13:45:51 +01:00
		 
	
		
			
			
			
			
			
			2021-09-12 22:26:04 +02:00
		 
	
		
			
			
			
			
			
			2023-08-26 15:01:10 +01:00
		 
	
		
			
			
			
			
			
			2023-08-26 15:01:10 +01:00
		 
	
		
			
			
			
			
			
			2022-12-12 23:19:44 +00:00
		 
	
		
			
			
			
			
			
			2022-12-12 23:19:44 +00:00
		 
	
		
			
			
			
			
			
			2023-04-02 13:11:11 +01:00
		 
	
		
			
			
			
			
			
			2023-10-23 22:49:07 +01:00
		 
	
		
			
			
			
			
			
			2023-04-13 21:19:53 +01:00
		 
	
		
			
			
			
			
			
			2023-04-13 21:19:53 +01: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
		 
	
		
			
			
			
			
			
			2023-08-12 22:01:22 +02:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2023-03-26 11:08:37 +02:00
		 
	
		
			
			
			
			
			
			2023-05-23 22:21:19 +01:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00