]> git.ipfire.org Git - thirdparty/google/fonts.git/commitdiff
Merge commit '2d08f1a1890851bc7860a6fd8e9b8b49597a384d' into axis-registry-pull-SHRP 6212/head
authorViviana Monsalve <viviana.monsalve.a@gmail.com>
Thu, 20 Apr 2023 22:57:18 +0000 (17:57 -0500)
committerViviana Monsalve <viviana.monsalve.a@gmail.com>
Thu, 20 Apr 2023 22:57:18 +0000 (17:57 -0500)
1  2 
axisregistry/Lib/axisregistry/__init__.py
axisregistry/Lib/axisregistry/data/sharpness.textproto
axisregistry/tests/data/Playfair[opsz,wdth,wght].ttf
axisregistry/tests/data/Wavefont[ROND,YALN,wght].ttf
axisregistry/tests/data/Wavefont[ROND,YALN,wght]_STAT.ttx
axisregistry/tests/test_names.py

index 0000000000000000000000000000000000000000,c12217ad9f67f62eb22b8b53f0b7d54f0b806cbe..c12217ad9f67f62eb22b8b53f0b7d54f0b806cbe
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,1692b405a122b25a0fc1133033c0830381a0be5e..1692b405a122b25a0fc1133033c0830381a0be5e
mode 000000,100644..100644
Binary files differ
index 0000000000000000000000000000000000000000,b04e28047dff18ea5bee5cedd2e4fd99a87baa24..b04e28047dff18ea5bee5cedd2e4fd99a87baa24
mode 000000,100644..100644
Binary files differ
index 0000000000000000000000000000000000000000,22645ba4811d18244bcbde0420a07223830341ff..22645ba4811d18244bcbde0420a07223830341ff
mode 000000,100644..100644
--- /dev/null
Simple merge