OpenTTD-patches/media
Jonathan G Rennison 8eb27e1ac7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h
2021-04-25 22:14:59 +01:00
..
baseset Merge branch 'master' into jgrpp 2021-04-25 22:14:59 +01:00
CMakeLists.txt Add: [CMake] Install menu and media files 2021-03-09 22:42:25 +01:00
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.desktop Add: [CMake] Install menu and media files 2021-03-09 22:42:25 +01:00
openttd.svg