OpenTTD-patches/media
Jonathan G Rennison 3a47b421b0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/overflowsafe_type.hpp
#	src/economy.cpp
#	src/engine_base.h
#	src/ground_vehicle.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/newgrf_commons.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_industries.cpp
#	src/newgrf_object.cpp
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_log.cpp
#	src/script/api/script_log.hpp
#	src/settings_gui.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strgen/strgen.cpp
#	src/string_func.h
#	src/string_type.h
#	src/table/settings/network_private_settings.ini
#	src/tests/math_func.cpp
#	src/textfile_gui.cpp
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/waypoint_cmd.h
#	src/widgets/dropdown.cpp
2023-06-03 19:16:57 +01:00
..
baseset Merge branch 'master' into jgrpp 2023-06-03 19:16:57 +01:00
CMakeLists.txt
openttd.16.png
openttd.32.bmp
openttd.32.png
openttd.32.xpm
openttd.48.png
openttd.64.png
openttd.64.xpm
openttd.128.png
openttd.256.png
openttd.512.png Add: Larger size renderings of the logo/icon (#8961) 2021-08-31 10:25:51 +02:00
openttd.1024.png Add: Larger size renderings of the logo/icon (#8961) 2021-08-31 10:25:51 +02:00
openttd.2048.png Add: Larger size renderings of the logo/icon (#8961) 2021-08-31 10:25:51 +02:00
openttd.desktop Change: Use the Simulation subcategory in openttd.desktop (#10015) 2022-09-12 09:18:13 +01:00
openttd.svg