[gtk: 6/6] Merge branch 'emoji-data-cldr' into 'master'




commit cb833d52fbd555a23f72c989c5d46050e5a0f9af
Merge: 9007d153c8 452c909b64
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Oct 4 13:56:40 2020 +0000

    Merge branch 'emoji-data-cldr' into 'master'
    
    Update Emoji data
    
    Closes #1511 and #950
    
    See merge request GNOME/gtk!2656

 gtk/emoji/README.md                                |    23 +
 gtk/emoji/convert-emoji.c                          |   166 +-
 gtk/emoji/de.data                                  |   Bin 0 -> 130007 bytes
 gtk/emoji/emoji.data                               |   Bin 55307 -> 0 bytes
 gtk/emoji/emoji.json                               | 15740 ---------
 gtk/emoji/emoji1.json                              | 34181 -------------------
 gtk/emoji/en.data                                  |   Bin 0 -> 100679 bytes
 gtk/emoji/es.data                                  |   Bin 0 -> 116759 bytes
 gtk/emoji/fr.data                                  |   Bin 0 -> 105211 bytes
 gtk/emoji/gresource.xml.in                         |     6 +
 gtk/emoji/zh.data                                  |   Bin 0 -> 95611 bytes
 gtk/gen-gtk-gresources-xml.py                      |     2 +-
 gtk/gtkemojichooser.c                              |   179 +-
 gtk/gtkemojicompletion.c                           |    19 +-
 gtk/gtkprivate.h                                   |     2 +
 gtk/meson.build                                    |    17 +
 gtk/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml |     8 +-
 17 files changed, 292 insertions(+), 50051 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]