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		2021-03-02 11:59:03 +00:00
..
ci-build.yml	Merge tag '1.11.0-beta2' into jgrpp	2021-03-02 11:59:03 +00:00
preview_build.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	2020-12-15 15:46:39 +01:00
preview_label.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	2020-12-15 15:46:39 +01:00
preview_push.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	2020-12-15 15:46:39 +01:00
release.yml	Merge tag '1.11.0-beta2' into jgrpp	2021-03-02 11:59:03 +00:00