[gtk: 7/7] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 7/7] Merge branch 'matthiasc/for-master' into 'master'
- Date: Fri, 12 Jun 2020 16:40:30 +0000 (UTC)
commit 106e1080ae11dfdcb26743c5f40ec46c87f836aa
Merge: 07ecb3cb78 74ac435ae6
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jun 12 16:39:46 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2080
gtk/gtkcustompaperunixdialog.c | 27 ++-
gtk/gtkcustompaperunixdialog.h | 1 +
gtk/gtkprinteroptionwidget.c | 433 +++++++++++++++++++++++++++++------------
gtk/gtkprintunixdialog.c | 305 ++++++++++++++---------------
gtk/theme/Adwaita/_common.scss | 2 +
gtk/ui/gtkdropdown.ui | 1 +
gtk/ui/gtkprintunixdialog.ui | 29 +--
tests/testdropdown.c | 248 +++++++++++++++++++++++
8 files changed, 737 insertions(+), 309 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]