[gtk: 12/12] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 12/12] Merge branch 'matthiasc/for-master' into 'master'
- Date: Sat, 3 Oct 2020 03:55:34 +0000 (UTC)
commit 949f22b8b2778c1f3e83b1e47d904fcad6a5b913
Merge: 68ae8506d5 a9809b0f67
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Oct 3 03:55:32 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
Closes #2261 and #1002
See merge request GNOME/gtk!2654
gdk/gdkglobals.c | 1 -
gsk/gl/gskglrenderer.c | 2 +-
gsk/gskrendernodeparser.c | 3 +-
gtk/css/gtkcssparserprivate.h | 3 --
gtk/{gtkcssparser.c => css/gtkcssserializer.c} | 16 ++++++----
.../gtkcssserializerprivate.h} | 27 ++++++++++-------
gtk/css/meson.build | 1 +
gtk/gtkcssarrayvalueprivate.h | 4 ++-
gtk/gtkcssbgsizevalueprivate.h | 4 ++-
gtk/gtkcssbordervalueprivate.h | 4 ++-
gtk/gtkcsscolorvalueprivate.h | 4 ++-
gtk/gtkcsscornervalueprivate.h | 4 ++-
gtk/gtkcsseasevalueprivate.h | 4 ++-
gtk/gtkcssenumvalueprivate.h | 4 ++-
gtk/gtkcssfiltervalueprivate.h | 4 ++-
gtk/gtkcssfontfeaturesvalue.c | 4 ++-
gtk/gtkcssfontfeaturesvalueprivate.h | 4 ++-
gtk/gtkcssfontvariationsvalue.c | 4 ++-
gtk/gtkcssfontvariationsvalueprivate.h | 4 ++-
gtk/gtkcssimageicontheme.c | 3 +-
gtk/gtkcssimageprivate.h | 4 ++-
gtk/gtkcsskeyframesprivate.h | 4 ++-
gtk/gtkcssnumbervalueprivate.h | 4 ++-
gtk/gtkcsspalettevalueprivate.h | 4 ++-
gtk/gtkcsspositionvalueprivate.h | 4 ++-
gtk/gtkcssprovider.c | 4 ++-
gtk/gtkcssrepeatvalueprivate.h | 4 ++-
gtk/gtkcssselectorprivate.h | 4 ++-
gtk/gtkcssshadowvalueprivate.h | 4 ++-
gtk/gtkcssshorthandpropertyprivate.h | 4 ++-
gtk/gtkcssstringvalue.c | 3 +-
gtk/gtkcssstringvalueprivate.h | 4 ++-
gtk/gtkcssstylepropertyimpl.c | 4 ++-
gtk/gtkcsstransformvalueprivate.h | 4 ++-
gtk/gtkemojichooser.c | 27 ++++++++++++++++-
gtk/gtkenums.h | 5 +++-
gtk/gtkpicture.c | 2 +-
gtk/gtkstyleproperty.c | 4 ++-
gtk/gtkstylepropertyprivate.h | 4 ++-
gtk/meson.build | 1 -
make-release.sh | 4 +--
meson.build | 2 +-
subprojects/gtk-doc.wrap | 2 +-
testsuite/gsk/shader.c | 35 ++++++++++++++++++++++
44 files changed, 187 insertions(+), 58 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]