Merge branch 'master' into sh_merge_master

This commit is contained in:
Ralf W. Grosse-Kunstleve
2022-09-15 05:35:19 -07:00
11 changed files with 161 additions and 66 deletions

View File

@@ -755,7 +755,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.12
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.10.0
uses: ilammy/msvc-dev-cmd@v1.11.0
with:
arch: x86
@@ -808,7 +808,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.12
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.10.0
uses: ilammy/msvc-dev-cmd@v1.11.0
with:
arch: x86