Jonathan G Rennison b72366419b Merge branch 'master' into jgrpp ... # Conflicts: # src/blitter/32bpp_anim.cpp # src/blitter/8bpp_optimized.cpp # src/gfx.cpp # src/gfx_func.h # src/gfxinit.cpp # src/network/core/os_abstraction.cpp # src/spritecache.cpp		2023-12-28 16:56:54 +00:00
..
baseset	Merge branch 'master' into jgrpp	2023-12-28 16:56:54 +00: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
openttd.1024.png
openttd.2048.png
openttd.desktop	Update openttd.desktop -> change app name	2023-08-08 22:20:57 +02:00
openttd.svg