diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 21:07:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 21:07:40 +0000 |
| commit | 80dbd6ea6f37793109b0ab5bfd43bac811810481 (patch) | |
| tree | cefb099aba71c769dca55b54d5b87a54faf8db6b /pango/pango-emoji.c | |
| parent | 1fedc11aa03d95e4e365f01796ecceca8b0acd0e (diff) | |
| parent | cc8ac2a10360027b334db8e4b237207540004ae7 (diff) | |
| download | pango-80dbd6ea6f37793109b0ab5bfd43bac811810481.tar.gz | |
Merge branch 'revert-1fedc11a' into 'master'
Revert "Merge branch 'fix-deadlocks' into 'master'"
See merge request GNOME/pango!311
Diffstat (limited to 'pango/pango-emoji.c')
0 files changed, 0 insertions, 0 deletions