Jonathan G Rennison 3436e0a781 Merge branch 'master' into jgrpp ... # Conflicts: # src/error.h # src/error_gui.cpp # src/linkgraph/linkgraph_gui.cpp # src/misc_gui.cpp # src/newgrf_gui.cpp # src/news_gui.cpp # src/rail_cmd.cpp # src/saveload/gamelog_sl.cpp # src/script/api/script_text.cpp # src/script/script_instance.cpp # src/statusbar_gui.cpp # src/strings.cpp # src/strings_func.h # src/strings_internal.h # src/table/settings/gui_settings.ini # src/table/settings/linkgraph_settings.ini # src/textbuf_gui.h		2023-11-09 01:55:23 +00:00
..
emscripten	Change: [CI] rework preview flow and use Cloudflare Pages to publish (#11116)	2023-07-08 12:30:27 +02:00
macosx	Merge branch 'master' into jgrpp	2023-09-12 20:06:47 +01:00
steam	Add: [Actions] Automatically upload releases to Steam (#8644)	2021-02-05 20:58:15 +01:00
windows	Fix: Ensure logo for Windows Store common assets package is named correctly	2023-02-07 09:23:44 +00:00