You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
1 year ago
..
baseset Merge branch 'master' into jgrpp 1 year ago
CMakeLists.txt Add: [CMake] Install menu and media files 3 years ago
openttd.16.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.32.bmp (svn r5872) - Feature: Add an icon to the SDL openttd executable. 18 years ago
openttd.32.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.32.xpm (svn r2371) - Fix: [ 1144510 ] make install tries to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified. 19 years ago
openttd.48.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.64.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.64.xpm (svn r1601) Add: A brand new set of icons. 20 years ago
openttd.128.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.256.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.512.png Add: Larger size renderings of the logo/icon (#8961) 3 years ago
openttd.1024.png Add: Larger size renderings of the logo/icon (#8961) 3 years ago
openttd.2048.png Add: Larger size renderings of the logo/icon (#8961) 3 years ago
openttd.desktop Change: Use the Simulation subcategory in openttd.desktop (#10015) 2 years ago
openttd.svg (svn r18655) -Fix: the icon that is supposed to be 256x256 pixels wasn't 256x256 pixels 15 years ago