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



commit 9f4e7b1249c8e0d33d36864dfc9c7f1cf229ca2e
Merge: c1658903b7 378cca75ea
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 14 03:28:08 2020 +0000

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

 demos/gtk-demo/fishbowl.ui             |  1 +
 demos/widget-factory/widget-factory.c  |  4 ++-
 demos/widget-factory/widget-factory.ui |  1 +
 gtk/gtkflowbox.c                       | 28 ++++++++++++++--
 gtk/gtklistbox.c                       | 12 ++++++-
 gtk/inspector/window.c                 | 11 +++++++
 testsuite/gtk/flowbox.c                | 59 ++++++++++++++++++++++++++++++++++
 testsuite/gtk/meson.build              |  1 +
 8 files changed, 113 insertions(+), 4 deletions(-)
---


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