Skip to content

Commit 4e31a5f

Browse files
committed
Merge branch 'sycl' into chedy/fix-mipmap-leak
# Conflicts: # sycl/cmake/modules/UnifiedRuntimeTag.cmake
2 parents fb7ce66 + 06e5737 commit 4e31a5f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# commit d8fde1bdb3c60af0ee13cc44fab567a508644f77
2-
# Merge: d88481bf20a0 bc5105f1cf30
1+
# commit aa72577da55571b15028dd1710e02a7ea4f62338
2+
# Merge: 89def64486dd 3d2b7210e352
33
# Author: Martin Grant <[email protected]>
4-
# Date: Fri Dec 6 12:05:32 2024 +0000
5-
# Merge pull request #2266 from zhaomaosu/reuse-shadow-memory
6-
# [DeviceASAN] Re-use shadow if required size is not larger than last one
4+
# Date: Fri Dec 6 15:24:04 2024 +0000
5+
# Merge pull request #2352 from aarongreig/aaron/fixCoverity15-11
6+
# Fix a number of issues from the latest coverity scan.
77
set(UNIFIED_RUNTIME_TAG 73ba29bfe9dfbd8ac985051f7a81a349ed4e3e08)

0 commit comments

Comments
 (0)