[gtk: 6/6] Merge branch 'matthiasc/for-master' into 'master'




commit 15172ebdb0816a73dcaec1a78f61031496082715
Merge: 74a7f73239 bfe5b0d1b7
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 11 20:49:51 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2810

 demos/gtk-demo/demo.gresource.xml |   2 +
 demos/gtk-demo/meson.build        |   1 +
 demos/gtk-demo/paintable_svg.c    | 173 ++------------------------------------
 demos/gtk-demo/svgpaintable.c     | 166 ++++++++++++++++++++++++++++++++++++
 demos/gtk-demo/svgpaintable.h     |  13 +++
 gtk/gtklabel.c                    |  70 +++++++--------
 gtk/gtkwidget.c                   |   2 -
 gtk/theme/Adwaita/_common.scss    |  10 +--
 8 files changed, 227 insertions(+), 210 deletions(-)
---


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