Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
levinli303 committed Dec 11, 2023
2 parents 97b23bd + 5882218 commit 3aafa1e
Show file tree
Hide file tree
Showing 61 changed files with 9,873 additions and 9,214 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Update vcpkg
shell: pwsh
run: |
$vcpkgCommit = 'ac2a14f35fcd57d7a38f09af75dd5258e96dd6ac'
$vcpkgCommit = '16ee2ecb31788c336ace8bb14c21801efb6836e4'
pushd "$env:VCPKG_INSTALLATION_ROOT"
git fetch --depth=1 origin $vcpkgCommit
git reset --hard $vcpkgCommit
Expand Down
Loading

0 comments on commit 3aafa1e

Please sign in to comment.