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

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

openttd.32.bmp

(svn r5872) - Feature: Add an icon to the SDL openttd executable.

2006-08-13 08:18:11 +00:00

openttd.32.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

openttd.32.xpm

(svn r2371) - Fix: [ 1144510 ] make install tries to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified.

2005-05-28 10:32:09 +00:00

openttd.48.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

openttd.64.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

openttd.64.xpm

(svn r1601) Add: A brand new set of icons.

2005-01-22 23:57:03 +00:00

openttd.128.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

openttd.256.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

openttd.desktop

Add: [CMake] Install menu and media files

2021-03-09 22:42:25 +01:00

openttd.svg

(svn r18655) -Fix: the icon that is supposed to be 256x256 pixels wasn't 256x256 pixels

2009-12-28 19:26:44 +00:00