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/os
Jonathan G Rennison 15f4e62936 Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network.cpp
#	src/pathfinder/yapf/yapf.h
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/station_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
3 months ago
..
emscripten Codechange: upgrade Emscripten to 3.1.57 (#12526) 5 months ago
linux Fix: [CI] patch in SHF_COMPRESSED symbol for our Linux Generic binaries (#11651) 9 months ago
macosx Merge branch 'master' into jgrpp 1 year ago
steam
windows Merge branch 'master' into jgrpp 4 months ago