Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve of merge (conflict) 41c5608 Fix the use of report_fatal_error…
… '"master"' -> '"xmain-web"' (23 commits) (KhronosGroup#29) * Resolve of merge (conflict) 41c5608 Fix the use of report_fatal_error '"master"' -> '"xmain-web"' (23 commits) CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVUtil.cpp CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp commit 41c5608 Author: Nikita Kornev <[email protected]> Date: Thu Oct 7 10:17:45 2021 +0300 Fix the use of report_fatal_error * Resolve of merge (conflict) 41c5608 Fix the use of report_fatal_error '"master"' -> '"xmain-web"' (23 commits) CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVUtil.cpp CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVLowerBitCastToNonStandardType.cpp commit 41c5608 Author: Nikita Kornev <[email protected]> Date: Thu Oct 7 10:17:45 2021 +0300 Fix the use of report_fatal_error Co-authored-by: iclsrc <[email protected]>
- Loading branch information