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
Jonathan G Rennison f7de298042 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	os/macosx/Info.plist.in
#	src/base_media_base.h
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/command_type.h
#	src/company_cmd.cpp
#	src/company_cmd.h
#	src/date_gui.cpp
#	src/dropdown.cpp
#	src/error_gui.cpp
#	src/fontcache/truetypefontcache.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/gfx_layout.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_text.h
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/order_base.h
#	src/order_gui.cpp
#	src/os/macosx/font_osx.cpp
#	src/pathfinder/yapf/yapf_costcache.hpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/roadstop_base.h
#	src/screenshot.cpp
#	src/script/api/script_cargolist.cpp
#	src/script/api/script_order.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spritecache.h
#	src/station_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/tests/mock_spritecache.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widget.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
3 weeks ago
..
ISSUE_TEMPLATE Merge branch 'master' into jgrpp-beta 3 years ago
codeql Codechange: [CodeQL] Disable CodeQL check on trivial switch statements (#10537) 2 years ago
workflows Merge branch 'master' into jgrpp 3 weeks ago
FUNDING.yml Add: [GitHub] sponsor button on github.com (#7700) 5 years ago
PULL_REQUEST_TEMPLATE.md Doc: Update documentation how to make commit message (#12046) 7 months ago
changelog.sh Fix: [Actions] changelog assumed major.minor.patch versioning (#9482) 3 years ago
script-missing-mode-enforcement.py Change: Allow GS access to ScriptGroup functions 1 year ago
unused-strings.py Add: workflow and script for checking missing mode enforcements 2 years ago