Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp

2021-11-01 18:54:43 +00:00

..

emscripten

Change: [Emscripten] set default scrolling mode to non-pointer-locking (#9191)

2021-06-28 18:39:09 +02:00

macosx

MacOS: Change bundle ID

2021-02-25 12:15:37 +00:00

os2

Change: Heading for 1.11 now

2020-02-08 23:38:49 +01:00

steam

Add: [Actions] Automatically upload releases to Steam (#8644)

2021-02-05 20:58:15 +01:00

windows

Feature: Sign Windows builds

2021-05-26 13:40:44 +01:00