Merge branch 'master' into jgrpp

# Conflicts:
#	src/newgrf_station.cpp
This commit is contained in:
Jonathan G Rennison
2022-09-14 19:43:12 +01:00
11 changed files with 51 additions and 29 deletions

View File

@@ -6,6 +6,6 @@ Name=OpenTTD
Icon=${BINARY_NAME}
Exec=${BINARY_NAME}
Terminal=false
Categories=Game;
Categories=Game;Simulation;
Keywords=game;simulation;transport;tycoon;deluxe;economics;multiplayer;money;train;ship;bus;truck;aircraft;cargo;
@Comment_STR_DESKTOP_SHORTCUT_COMMENT@