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



commit 0b6cd34b1dbcb0ba6743655ee31edded9bdbc181
Merge: 764e43b871 e1b25eaf5a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 26 19:20:47 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    widget-factory improvements
    
    See merge request GNOME/gtk!1767

 demos/widget-factory/gtk-logo.webm                | Bin 0 -> 288388 bytes
 demos/widget-factory/widget-factory.c             |  93 +++++++++++++++++++++-
 demos/widget-factory/widget-factory.gresource.xml |   3 +
 demos/widget-factory/widget-factory.ui            |  64 +++++----------
 gdk/default_cursor.png                            | Bin 0 -> 1252 bytes
 gdk/gdkvulkancontext.c                            |  16 +++-
 gdk/gen-gdk-gresources-xml.py                     |   2 +-
 gdk/wayland/gdkcursor-wayland.c                   |  11 ++-
 gtk/inspector/resource-list.c                     |  18 ++++-
 gtk/inspector/resource-list.ui                    |   2 +-
 10 files changed, 158 insertions(+), 51 deletions(-)
---


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