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
..
ai_widget.h
airport_widget.h
autoreplace_widget.h
bootstrap_widget.h
bridge_widget.h
build_vehicle_widget.h
cheat_widget.h
CMakeLists.txt
company_widget.h
console_widget.h
date_widget.h
departures_widget.h
depot_widget.h
dock_widget.h
dropdown_func.h
dropdown_type.h
dropdown_widget.h
dropdown.cpp
engine_widget.h
error_widget.h
fios_widget.h
framerate_widget.h
game_widget.h
genworld_widget.h
goal_widget.h
graph_widget.h
group_widget.h
help_widget.h
highscore_widget.h
industry_widget.h
intro_widget.h
league_widget.h
link_graph_legend_widget.h
main_widget.h
misc_widget.h
music_widget.h
network_chat_widget.h
network_content_widget.h
network_widget.h
newgrf_debug_widget.h
newgrf_widget.h
news_widget.h
object_widget.h
order_widget.h	Add try to acquire slot order subtype	2024-01-11 21:04:49 +00:00
osk_widget.h
plans_widget.h
rail_widget.h	Add setting for whether to show rail polyline tool	2024-01-06 19:10:43 +00:00
road_widget.h
screenshot_widget.h
script_widget.h
settings_widget.h	Merge branch 'master' into jgrpp	2024-01-15 17:42:26 +00:00
sign_widget.h
slider_func.h
slider.cpp
smallmap_widget.h
station_widget.h
statusbar_widget.h
story_widget.h
subsidy_widget.h
terraform_widget.h
timetable_widget.h
toolbar_widget.h
town_widget.h
transparency_widget.h
tree_widget.h
vehicle_widget.h
viewport_widget.h
waypoint_widget.h