Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ vars = {
'skia_git': 'https://skia.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': '88c5af7ecd72090b2d2eff2aec3a28c30c72a7fb',
'skia_revision': '8e6b60f27da371c39abfeddd35c9a6ea89b4b5c2',

# 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
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: fe67b35d41056ddf5e65d8e7bbd63c32
Signature: 7fe2b8891dce80db3f8e57ff22512fb2

UNUSED LICENSES:

Expand Down
15 changes: 8 additions & 7 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -7320,7 +7320,7 @@ obstacle to adoption, that text has been removed.
glfw

Copyright (c) 2002-2006 Marcus Geelnard
Copyright (c) 2006-2016 Camilla Berglund <[email protected]>
Copyright (c) 2006-2016 Camilla Löwy <[email protected]>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand All @@ -7344,7 +7344,7 @@ freely, subject to the following restrictions:
glfw

Copyright (c) 2002-2006 Marcus Geelnard
Copyright (c) 2006-2016 Camilla Berglund <[email protected]>
Copyright (c) 2006-2016 Camilla Löwy <[email protected]>
Copyright (c) 2012 Torsten Walluhn <[email protected]>

This software is provided 'as-is', without any express or implied
Expand All @@ -7368,7 +7368,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
glfw

Copyright (c) 2006-2016 Camilla Berglund <[email protected]>
Copyright (c) 2006-2016 Camilla Löwy <[email protected]>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand All @@ -7391,7 +7391,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
glfw

Copyright (c) 2009-2016 Camilla Berglund <[email protected]>
Copyright (c) 2009-2016 Camilla Löwy <[email protected]>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand All @@ -7414,7 +7414,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
glfw

Copyright (c) 2009-2016 Camilla Berglund <[email protected]>
Copyright (c) 2009-2016 Camilla Löwy <[email protected]>
Copyright (c) 2012 Torsten Walluhn <[email protected]>

This software is provided 'as-is', without any express or implied
Expand All @@ -7438,7 +7438,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
glfw

Copyright (c) 2010-2016 Camilla Berglund <[email protected]>
Copyright (c) 2010-2016 Camilla Löwy <[email protected]>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down Expand Up @@ -7484,7 +7484,8 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
glfw

Copyright (c) 2014-2015 Brandon Schaefer <[email protected]>
Copyright (c) 2016 Google Inc.
Copyright (c) 2006-2016 Camilla Löwy <[email protected]>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down