[gtk: 11/11] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 11/11] Merge branch 'matthiasc/for-master' into 'master'
- Date: Thu, 9 Jul 2020 02:09:35 +0000 (UTC)
commit 8fb1e33d0f13b2de974fedf41f4e1895ccd885b2
Merge: 52982a88aa 0dc946da63
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jul 9 02:08:53 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
directorylist: Fix file monitoring implementation
See merge request GNOME/gtk!2209
.gitlab-ci/fedora-base.Dockerfile | 1 +
gsk/gsktransform.c | 3 ++-
gtk/gtkbookmarklist.c | 2 ++
gtk/gtkcssprovider.c | 29 +++++++++++++----------------
gtk/gtkdirectorylist.c | 10 ++++++----
gtk/gtkpicture.c | 1 +
gtk/gtkshortcuttrigger.c | 10 ++++++++--
testsuite/gdk/memorytexture.c | 4 ++--
testsuite/gtk/bitmask.c | 8 +++++++-
testsuite/gtk/filtermodel.c | 7 +++++--
testsuite/gtk/shortcuts.c | 2 ++
testsuite/gtk/test-focus-chain.c | 1 +
testsuite/gtk/textbuffer.c | 1 +
testsuite/reftests/gtk-reftest.c | 3 +++
14 files changed, 54 insertions(+), 28 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]