dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32.h
#	src/video/win32_v.cpp
#	src/video/win32_v.h
This commit is contained in:
Jonathan G Rennison
2024-01-12 18:57:14 +00:00
parent 0436dd1abe 03df70ce8a
commit 8ae1587987
27 changed files with 378 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release-linux.yml vendored
View File

@@ -50,7 +50,7 @@ jobs:
uses: dtolnay/rust-toolchain@stable
- name: Enable Rust cache
uses: Swatinem/rust-cache@v2
uses: Swatinem/rust-cache@v2.7.0
- name: Setup vcpkg caching
uses: actions/github-script@v6