Jonathan G Rennison 0a9c44d1a2 Merge branch 'master' into jgrpp ... # Conflicts: # src/airport_gui.cpp # src/blitter/32bpp_anim_sse4.cpp # src/console_cmds.cpp # src/linkgraph/linkgraph_gui.cpp # src/newgrf_object.h # src/road_gui.cpp # src/widgets/road_widget.h # src/window.cpp		2022-10-16 20:14:13 +01:00
..
baseset	Merge branch 'master' into jgrpp	2022-10-16 20:14:13 +01: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	Change: Use the Simulation subcategory in openttd.desktop (#10015)	2022-09-12 09:18:13 +01:00
openttd.svg