diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-01-15 17:57:35 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-15 17:57:35 +0200 |
commit | 4bd7bafd7cef0c2f1238dcbbbf4282e6bc5a684f (patch) | |
tree | ecd6628c082ffdd0e12e1ac7616e69f9be0f55ac /.github/workflows/reLCS_msvc_amd64.yml | |
parent | c00ebef329423482929fef5fd8a412e97eb17cad (diff) | |
parent | 19749effce625c31ab6bb2bf7293fcde94048208 (diff) |
Merge branch 'miami' into lcs
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# premake5.lua
# src/control/Script2.cpp
# src/control/Script8.cpp
Diffstat (limited to '.github/workflows/reLCS_msvc_amd64.yml')
-rw-r--r-- | .github/workflows/reLCS_msvc_amd64.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/reLCS_msvc_amd64.yml b/.github/workflows/reLCS_msvc_amd64.yml index 012051a9..f79df578 100644 --- a/.github/workflows/reLCS_msvc_amd64.yml +++ b/.github/workflows/reLCS_msvc_amd64.yml @@ -1,4 +1,4 @@ -name: reLCS_msvc_amd64 +name: reLCS premake amd64 on: pull_request: |