diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-10-23 19:00:36 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-10-23 19:00:36 +0000 |
| commit | c6d557f263eb28cadf405e9a2dcb55f0cb93c44f (patch) | |
| tree | dd8b072bfea3c191da1bf33526eda36c9fc5bd6d | |
| parent | a0d7555fc00f04d1283acd5cac36feab77433e53 (diff) | |
| parent | e46a0fb53e92f359e739a818f0e0ce0d2fbf6c18 (diff) | |
| download | pango-c6d557f263eb28cadf405e9a2dcb55f0cb93c44f.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
Fix a typo
See merge request GNOME/pango!482
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b9f5200..ec6ceb75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,6 +88,7 @@ msys2-mingw64: macos: extends: .only-default + allow_failure: true only: - branches@GNOME/pango stage: build diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 388ed2d3..1d67485a 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -3167,7 +3167,7 @@ ensure_faces (PangoFcFamily *fcfamily) fontset = fcfamily->patterns; - /* at most we have 3 additional artifical faces */ + /* at most we have 3 additional artificial faces */ faces = g_new (PangoFcFace *, fontset->nfont + 3); regular_weight = 0; |