[gtk: 6/6] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 6/6] Merge branch 'matthiasc/for-master' into 'master'
- Date: Wed, 12 Aug 2020 10:51:19 +0000 (UTC)
commit dbc6a94daf3ff754df1d25737da6c49c90c30085
Merge: e0b95c6234 0a9acd10d2
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Aug 12 10:51:17 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2429
demos/gtk-demo/demo.gresource.xml | 21 ++--
demos/gtk-demo/demochild.c | 72 ++++++++++++
demos/gtk-demo/demochild.h | 8 ++
demos/gtk-demo/demolayout.c | 189 +++++++++++++++++++++++++++++++
demos/gtk-demo/demolayout.h | 13 +++
demos/gtk-demo/demowidget.c | 121 ++++++++++++++++++++
demos/gtk-demo/demowidget.h | 11 ++
demos/gtk-demo/layoutmanager.c | 61 ++++++++++
demos/gtk-demo/meson.build | 7 +-
demos/gtk-demo/peg_solitaire.c | 72 ++++++++++--
demos/gtk-demo/pixbufs.c | 228 --------------------------------------
gdk/gdktoplevelsize.c | 12 +-
12 files changed, 560 insertions(+), 255 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]