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.

Jonathan G Rennison f4e29071be Merge tag '1.11.0-beta2' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release.yml # CMakeLists.txt # src/blitter/32bpp_optimized.cpp # src/debug.cpp # src/gfx.cpp # src/gfx_func.h # src/lang/czech.txt # src/lang/english.txt # src/lang/italian.txt # src/lang/swedish.txt # src/lang/ukrainian.txt # src/network/network_server.cpp # src/os/windows/crashlog_win.cpp # src/os/windows/win32.cpp # src/pathfinder/follow_track.hpp # src/screenshot.cpp # src/settings_type.h # src/spritecache.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/video/video_driver.cpp # src/video/video_driver.hpp # src/video/win32_v.cpp		3 years ago
..
npf	Merge branch 'master' into jgrpp	3 years ago
yapf	Merge tag '1.11.0-beta2' into jgrpp	3 years ago
CMakeLists.txt	Add: introduce CMake for project management	4 years ago
follow_track.hpp	Merge tag '1.11.0-beta2' into jgrpp	3 years ago
pathfinder_func.h	Fix #8123: trams on half-tiles couldn't find depots (#8738)	3 years ago
pathfinder_type.h	Merge branch 'master' into jgrpp	4 years ago
pf_performance_timer.hpp	Merge branch 'master' into jgrpp	5 years ago