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



commit bf1a9b2b0dc1b18a305931c624bda1d2776db0e4
Merge: 62d98ac60c a3368ab7e9
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 27 03:30:30 2020 +0000

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

 demos/gtk-demo/demo.gresource.xml      |   3 +
 demos/gtk-demo/help-overlay.ui         |  25 ++++++
 demos/gtk-demo/main.c                  |  13 +++
 demos/gtk-demo/main.ui                 |   4 +
 demos/icon-browser/iconbrowserapp.c    |  69 ++++++++++++++-
 demos/icon-browser/window.ui           |  19 ++++
 demos/widget-factory/widget-factory.c  |   4 +-
 demos/widget-factory/widget-factory.ui | 155 ++++++++++++++++++++++++++++++---
 8 files changed, 277 insertions(+), 15 deletions(-)
---


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