[gtk/filechooser-amberol: 9/9] Merge branch 'main' into 'filechooser-amberol'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/filechooser-amberol: 9/9] Merge branch 'main' into 'filechooser-amberol'
- Date: Wed, 19 Oct 2022 18:59:22 +0000 (UTC)
commit 3155d96904614b94e145fd98cc200b25ea5cda82
Merge: b0b513caea 8a3f1a1fa1
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 19 18:59:21 2022 +0000
Merge branch 'main' into 'filechooser-amberol'
# Conflicts:
# docs/reference/gtk/gtk4-builder-tool.rst
docs/reference/gtk/gtk4-builder-tool.rst | 8 +-
tools/fake-scope.c | 213 +++++++++++++++++++++++++++++++
tools/fake-scope.h | 9 ++
tools/gtk-builder-tool-enumerate.c | 39 +++++-
tools/gtk-builder-tool-validate.c | 203 ++++++++++++++---------------
tools/meson.build | 3 +-
6 files changed, 367 insertions(+), 108 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]