Jonathan G Rennison 324e90e5ac Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/lang/arabic_egypt.txt # src/lang/english.txt # src/lang/greek.txt # src/network/core/tcp_connect.cpp # src/network/network_client.cpp # src/network/network_client.h # src/pathfinder/npf/npf.cpp # src/pathfinder/yapf/yapf_ship.cpp # src/rail_gui.cpp # src/settings_table.cpp # src/settings_type.h # src/station_cmd.cpp # src/table/settings/gui_settings.ini # src/town_cmd.cpp # src/widgets/rail_widget.h		2021-11-02 19:23:24 +00:00
..
baseset	Add new signal type: no-entry signal	2021-09-04 11:39:54 +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.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	Add: [CMake] Install menu and media files	2021-03-09 22:42:25 +01:00
openttd.svg