[gtk: 37/37] Merge branch 'wip/baedert/for-master' into 'master'




commit b79c26b39efa854c7464df81d3aaed2b2c9bece5
Merge: 7c5b8911d8 42fedfc870
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 5 15:20:25 2021 +0000

    Merge branch 'wip/baedert/for-master' into 'master'
    
    Wip/baedert/for master
    
    See merge request GNOME/gtk!3029

 demos/widget-factory/widget-factory.ui |    1 -
 gdk/wayland/gdkglcontext-wayland.c     |   69 +-
 gtk/css/gtkcsstokenizer.c              |  198 +-
 gtk/gtkbox.c                           |    6 +-
 gtk/gtkbuilderparser.c                 |   52 +-
 gtk/gtkbuilderprivate.h                |    7 +-
 gtk/gtkframe.c                         |   15 +-
 gtk/gtkgesture.c                       |    2 +-
 gtk/gtkgesturelongpress.c              |   28 +-
 gtk/gtkgesturestylus.c                 |   26 +-
 gtk/gtkicontheme.c                     |    2 +-
 gtk/gtklabel.c                         | 6282 +++++++++++++++-----------------
 gtk/gtklabelprivate.h                  |   18 -
 gtk/gtkmessagedialog.c                 |  522 ++-
 gtk/gtkrender.c                        |   43 +-
 gtk/gtkscrolledwindow.c                |   39 +-
 gtk/gtksettings.c                      |   38 +-
 gtk/gtkshortcutmanager.c               |   17 +-
 gtk/gtkshortcuttrigger.c               |    3 -
 gtk/gtkviewport.c                      |    6 +-
 gtk/gtkwidget.c                        | 1469 ++++----
 21 files changed, 4203 insertions(+), 4640 deletions(-)
---


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