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




commit cddbc8f1cc1c7a5381469857bd9021047f57b747
Merge: f445cc0d70 a90801e696
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Sep 13 18:39:12 2020 +0000

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

 demos/gtk-demo/bbb.png                     | Bin 0 -> 13015 bytes
 demos/gtk-demo/css_pixbufs.c               |   3 +-
 demos/gtk-demo/demo.gresource.xml          |   7 ++
 demos/gtk-demo/errorstates.c               | 124 ++++++++++++++++++++++
 demos/gtk-demo/errorstates.ui              | 158 +++++++++++++++++++++++++++++
 demos/gtk-demo/meson.build                 |   1 +
 demos/gtk-demo/video_player.c              |  75 +++++++++++++-
 demos/widget-factory/widget-factory.ui     |   1 +
 docs/reference/gtk/gtk4-demo.xml           |   5 +
 docs/reference/gtk/gtk4-widget-factory.xml |   4 +
 gtk/gtkfilechooserwidget.c                 |   4 +-
 gtk/gtkplacessidebar.c                     |  19 ----
 gtk/gtkvideo.c                             |   2 +-
 13 files changed, 376 insertions(+), 27 deletions(-)
---


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