From: Viviana Monsalve Date: Thu, 20 Apr 2023 22:57:18 +0000 (-0500) Subject: Merge commit '2d08f1a1890851bc7860a6fd8e9b8b49597a384d' into axis-registry-pull-SHRP X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6212%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge commit '2d08f1a1890851bc7860a6fd8e9b8b49597a384d' into axis-registry-pull-SHRP --- 3aa97ad28b92d4629ccc38c7b8914c9b193a5255 diff --cc axisregistry/Lib/axisregistry/data/sharpness.textproto index 0000000000,c12217ad9f..c12217ad9f mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/sharpness.textproto +++ b/axisregistry/Lib/axisregistry/data/sharpness.textproto diff --cc axisregistry/tests/data/Playfair[opsz,wdth,wght].ttf index 0000000000,1692b405a1..1692b405a1 mode 000000,100644..100644 Binary files differ diff --cc axisregistry/tests/data/Wavefont[ROND,YALN,wght].ttf index 0000000000,b04e28047d..b04e28047d mode 000000,100644..100644 Binary files differ diff --cc axisregistry/tests/data/Wavefont[ROND,YALN,wght]_STAT.ttx index 0000000000,22645ba481..22645ba481 mode 000000,100644..100644 --- a/axisregistry/tests/data/Wavefont[ROND,YALN,wght]_STAT.ttx +++ b/axisregistry/tests/data/Wavefont[ROND,YALN,wght]_STAT.ttx