diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-05 20:30:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-05 20:30:54 +0000 |
| commit | 3aa89efcf452cd0066f6b1173bf8904ab0911134 (patch) | |
| tree | 421f303eca65cb0d62ebf1f27c45983c67285323 | |
| parent | 2228181b35468d8186b3ccec633da09ac108499c (diff) | |
| parent | 82f40a92c16ff22d6bcef78bd1e37dd6bcd1c46d (diff) | |
| download | gtk+-3aa89efcf452cd0066f6b1173bf8904ab0911134.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!3263
| -rw-r--r-- | build-aux/flatpak/org.gtk.Demo4.json | 4 | ||||
| -rw-r--r-- | gtk/gtksearchentry.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json index 9922c759e0..1b7a542d80 100644 --- a/build-aux/flatpak/org.gtk.Demo4.json +++ b/build-aux/flatpak/org.gtk.Demo4.json @@ -35,10 +35,10 @@ "modules" : [ { "name" : "wayland", - "buildsystem" : "autotools", + "buildsystem" : "meson", "builddir" : true, "config-opts" : [ - "--disable-documentation" + "-Ddocumentation=false" ], "sources" : [ { diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c index 8b03286a02..0e45015a19 100644 --- a/gtk/gtksearchentry.c +++ b/gtk/gtksearchentry.c @@ -79,7 +79,7 @@ * ]| * * GtkSearchEntry has a single CSS node with name entry that carries - * a .sarch style class, and the text node is a child of that. + * a .search style class, and the text node is a child of that. * * # Accessibility * |