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
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2023-08-02 20:28:51 +01:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00
		 
	
		
			
			
			
			
			
			2023-08-19 10:18:31 +01:00
		 
	
		
			
			
			
			
			
			2023-08-19 10:18:31 +01:00
		 
	
		
			
			
			
			
			
			2023-04-16 18:58:21 +02:00
		 
	
		
			
			
			
			
			
			2023-11-13 19:08:22 +00:00
		 
	
		
			
			
			
			
			
			2021-04-24 21:16:06 +02:00
		 
	
		
			
			
			
			
			
			2021-02-22 23:17:45 +01:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00
		 
	
		
			
			
			
			
			
			2021-02-07 12:54:02 +01:00
		 
	
		
			
			
			
			
			
			2023-02-20 21:11:55 +00:00
		 
	
		
			
			
			
			
			
			2020-06-28 21:57:02 +01:00
		 
	
		
			
			
			
			
			
			2020-07-01 00:25:50 +01:00
		 
	
		
			
			
			
			
			
			2020-06-28 21:57:02 +01:00
		 
	
		
			
			
			
			
			
			2023-02-20 23:42:55 +00:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00
		 
	
		
			
			
			
			
			
			2020-06-05 19:36:05 +02:00
		 
	
		
			
			
			
			
			
			2023-05-01 22:17:56 +02:00
		 
	
		
			
			
			
			
			
			2020-06-30 09:43:00 +01:00
		 
	
		
			
			
			
			
			
			2023-05-01 22:17:56 +02:00
		 
	
		
			
			
			
			
			
			2023-08-20 17:16:08 +02:00
		 
	
		
			
			
			
			
			
			2020-06-28 21:57:02 +01:00
		 
	
		
			
			
			
			
			
			2021-02-08 23:23:24 +00:00
		 
	
		
			
			
			
			
			
			2020-06-28 21:57:02 +01:00
		 
	
		
			
			
			
			
			
			2020-06-28 21:57:02 +01:00
		 
	
		
			
			
			
			
			
			2023-08-14 00:20:04 +01:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00
		 
	
		
			
			
			
			
			
			2020-06-28 21:57:02 +01:00
		 
	
		
			
			
			
			
			
			2020-11-26 19:06:03 +00:00
		 
	
		
			
			
			
			
			
			2021-03-01 18:08:28 +00:00
		 
	
		
			
			
			
			
			
			2023-02-11 23:05:22 +00:00
		 
	
		
			
			
			
			
			
			2023-08-20 17:16:08 +02:00
		 
	
		
			
			
			
			
			
			2022-10-03 20:32:26 +01:00
		 
	
		
			
			
			
			
			
			2023-05-14 23:22:02 +02:00
		 
	
		
			
			
			
			
			
			2020-12-19 18:26:29 +01:00
		 
	
		
			
			
			
			
			
			2021-03-13 12:00:40 +00:00
		 
	
		
			
			
			
			
			
			2020-06-05 19:36:05 +02:00
		 
	
		
			
			
			
			
			
			2022-04-19 02:11:42 +02:00
		 
	
		
			
			
			
			
			
			2023-08-19 10:18:31 +01:00
		 
	
		
			
			
			
			
			
			2020-09-25 14:43:13 +01:00