Merge remote-tracking branch 'vanilla/next' into gaps-next

Airblader · Sep 21, 2022 · ec531e9 · ec531e9
2 parents 4e64087 + 0967021
commit ec531e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+i3-wm (4.21-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Wed, 21 Sep 2022 18:14:14 +0200
+
 i3-wm (4.20.1-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/docs/ipc b/docs/ipc
@@ -440,6 +440,9 @@ focus (array of integer)::
 	order. Traversing the tree by following the first entry in this array
 	will result in eventually reaching the one node with +focused+ set to
 	true.
+sticky (bool)::
+	Whether this window is "sticky". If it is also floating, this window will
+	be present on all workspaces on the same output.
 fullscreen_mode (integer)::
 	Whether this container is in fullscreen state or not.
     Possible values are

diff --git a/meson.build b/meson.build
@@ -63,7 +63,7 @@ config_h = declare_dependency(
   sources: vcs_tag(
     input: config_h_in,
     output: 'config.h',
-    fallback: meson.project_version() + ' (2022-09-21)',
+    fallback: meson.project_version() + '-non-git',
   )
 )