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




commit e854b90293f9e5a736a157485c9e002ee23c0076
Merge: 6d042d9e61 e90f5e8a20
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Dec 22 04:53:31 2020 +0000

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

 gdk/gdkevents.c               |  16 +++
 gdk/gdkeventsprivate.h        |   2 +
 gsk/gl/gskglrenderer.c        |  28 +++--
 gsk/gl/gskglrenderops.c       | 232 ++++++++++++++----------------------------
 gsk/gl/opbuffer.h             |   3 +-
 gsk/gskrendernodeimpl.c       |  17 +++-
 gsk/gsktransform.c            |  12 ++-
 gtk/gskpango.c                |  33 ++++--
 gtk/gskpango.h                |   5 +-
 gtk/gtkicontheme.c            |  13 +--
 gtk/gtklabel.c                | 190 +++++++++++++++-------------------
 gtk/gtkmain.c                 |  19 +---
 gtk/gtkrenderborder.c         |   6 +-
 gtk/gtktextlayout.c           |  17 +---
 gtk/inspector/layoutoverlay.c |  28 +++--
 gtk/tools/gdkpixbufutils.c    |  41 ++++----
 16 files changed, 291 insertions(+), 371 deletions(-)
---


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