 Jonathan G Rennison
		
	
	d7b75614bb
	
	
	Merge branch 'master' into jgrpp
			Jonathan G Rennison
		
	
	d7b75614bb
	
	
	Merge branch 'master' into jgrpp
		
			
			# Conflicts:
#	media/baseset/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console.cpp
#	src/debug.cpp
#	src/fontcache/freetypefontcache.cpp
#	src/network/network.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/windows/font_win32.cpp
#	src/settings_gui.cpp
#	src/video/sdl2_v.cpp
#	src/widgets/settings_widget.h
#	src/window_gui.h
		
	
 
		2024-01-15 17:42:26 +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
		 
	
		
			
			
			
			
			
			2023-09-11 18:55:23 +00:00
		 
	
		
			
			
			
			
			
			2019-10-20 17:12:54 +01:00
		 
	
		
			
			
			
			
			
			2023-12-02 23:11:00 +00:00
		 
	
		
			
			
			
			
			
			2024-01-04 13:40:59 +01: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
		 
	
		
			
			
			
			
			
			2023-09-11 18:55:23 +00:00
		 
	
		
			
			
			
			
			
			2023-11-26 17:29:27 +00:00
		 
	
		
			
			
			
			
			
			2023-11-26 17:29:27 +00: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
		 
	
		
			
			
			
			
			
			2024-01-14 22:14:31 +01:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00
		 
	
		
			
			
			
			
			
			2023-03-26 11:08:37 +02:00
		 
	
		
			
			
			
			
			
			2021-07-10 18:38:28 +02:00
		 
	
		
			
			
			
			
			
			2023-11-29 20:49:31 +00:00
		 
	
		
			
			
			
			
			
			2023-08-30 18:27:15 +00:00
		 
	
		
			
			
			
			
			
			2010-11-20 12:11:11 +00:00