Skip to content

Commit

Permalink
Merge branch 'main' into TextUnitFormat
Browse files Browse the repository at this point in the history
  • Loading branch information
yaakovschectman committed Feb 28, 2023
2 parents 67269ba + 06b9d7a commit dc61700
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars = {
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': '272946c7c1428dde9623444bb5ef28e9223e0777',
'skia_revision': '7e0367e830b8915087cf892d75fd27a1637fc2e8',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -829,7 +829,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/mac-amd64',
'version': '7eLQAJldHyttOlid3M-Po1rub2Wxm4Rk8ShNLVVRufsC'
'version': 'CyF7Zv5YjfR_wEsCItBcmGTwMmwIgVEJCxCEINMc12UC'
}
],
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 96ae08788ee0f2183073fb175c413dd2
Signature: 24e6e824b9ca74ddc8c3f5ec93092033

====================================================================================================
LIBRARY: etc1
Expand Down

0 comments on commit dc61700

Please sign in to comment.