Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into master.lion
Browse files Browse the repository at this point in the history
  • Loading branch information
blueboxd committed Feb 15, 2024
2 parents 5a0ee21 + b766400 commit 49afb46
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'quiche_revision': 'bb4f68479fd8fa4738339cdcc5782b04b985b72b',
'quiche_revision': 'efc574e1125251bc1c3195c0c183c843b4c0a1df',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other.
Expand Down Expand Up @@ -1808,7 +1808,7 @@ deps = {
'dep_type': 'cipd',
},

'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@5e57702048fad8a0ab1c0a5691d54e02c864d656',
'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@16c7058465af46e49cd1e976d499c07b3eb46a2b',

'src/third_party/vulkan_memory_allocator':
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '56300b29fbfcc693ee6609ddad3fdd5b7a449a21',
Expand Down
2 changes: 1 addition & 1 deletion net/third_party/quiche/src
Submodule src updated from bb4f68 to efc574
2 changes: 1 addition & 1 deletion third_party/vulkan-deps
Submodule vulkan-deps updated from 5e5770 to 16c705

0 comments on commit 49afb46

Please sign in to comment.