You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/.github/workflows
Jonathan G Rennison d5a7a67b8c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/ai/ai_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/blitter/null.hpp
#	src/company_gui.cpp
#	src/game/game_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/graph_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/network/network_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/openttd.cpp
#	src/pathfinder/npf/aystar.h
#	src/road_gui.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/script/script_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/sortlist_type.h
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/spriteloader/grf.hpp
#	src/spriteloader/spriteloader.hpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strings.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window_gui.h
5 months ago
..
ci-build.yml Merge branch 'master' into jgrpp 5 months ago
codeql.yml Merge branch 'master' into jgrpp 6 months ago
preview-build.yml Codechange: vendor the nlohmann-json library (#11290) 7 months ago
preview.yml Fix: [CI] preview for one PR could cancel the preview of another (#11121) 11 months ago
release-docs.yml Github: Change release workflows to match upstream 12 months ago
release-linux-distros.yml Release: Remove ubuntu 18.04, debian buster. Add debian bookworm 9 months ago
release-linux.yml Fix: [CI] Don't let SDL2 dependencies install too much stuff (#11537) 6 months ago
release-macos.yml Update: [CI] Use macos-12 image for release-macos workflow 6 months ago
release-source.yml Merge branch 'master' into jgrpp 7 months ago
release-windows.yml Codechange: vendor the nlohmann-json library (#11290) 7 months ago
release.yml Change: [CI] upload releases to new CDN (#11093) 11 months ago
script-missing-mode-enforcement.yml Add: workflow and script for checking missing mode enforcements 1 year ago
unused-strings.yml Merge branch 'master' into jgrpp 1 year ago