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

Airblader · Jul 26, 2020 · 1c3e429 · 1c3e429
2 parents 9e38032 + 5af9ea6
commit 1c3e429
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/I3_VERSION b/I3_VERSION
@@ -1 +1 @@
-4.18.1-non-git
+4.18.2-non-git
diff --git a/Makefile.am b/Makefile.am
@@ -118,7 +118,7 @@ EXTRA_DIST = \
 	I3_VERSION \
 	LICENSE \
 	PACKAGE-MAINTAINER \
-	RELEASE-NOTES-4.18.1 \
+	RELEASE-NOTES-4.18.2 \
 	generate-command-parser.pl \
 	parser-specs/commands.spec \
 	parser-specs/config.spec \

diff --git a/RELEASE-NOTES-4.18.1 → RELEASE-NOTES-4.18.2 b/RELEASE-NOTES-4.18.1 → RELEASE-NOTES-4.18.2
@@ -1,9 +1,9 @@
 
  ┌──────────────────────────────┐
- │ Release notes for i3 v4.18.1 │
+ │ Release notes for i3 v4.18.2 │
  └──────────────────────────────┘
 
-This is i3 v4.18.1. This version is considered stable. All users of i3 are
+This is i3 v4.18.2. This version is considered stable. All users of i3 are
 strongly encouraged to upgrade.
 
 This is a bugfix release for v4.18.
@@ -12,21 +12,17 @@ This is a bugfix release for v4.18.
  │ Bugfixes                   │
  └────────────────────────────┘
 
-  • Move parent nodes in scratchpad correctly
-  • i3bar: Call cont_child() more liberally
-  • Fix load_layout crash when floating node doesn't have CT_FLOATING_CON parent
-  • Fix SEGFAULT when i3bar receives invalid input
-  • Revert "floating_reposition: avoid extra tree_render"
-  • Call tree_render if floating move changes workspace
-  • Update EWMH properties on workspace move
-  • cmd_focus_sibling: Fix crash on workspace level
+  • floating_maybe_reassign_ws: only re-focus if previously focused
+    (fixes a focus issue with KDE notifications)
+  • get_output_by_name: guard output->primary with require_active
+  • i3bar: fix Xorg memory leak
 
  ┌────────────────────────────┐
  │ Thanks!                    │
  └────────────────────────────┘
 
 Thanks for testing, bugfixes, discussions and everything I forgot go out to:
 
-  Heman Gandhi, Orestis Floros
+  Orestis Floros
 
--- Michael Stapelberg, 2020-04-22
+-- Michael Stapelberg, 2020-07-26
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Run autoreconf -fi to generate a configure script from this file.
 
 AC_PREREQ([2.69])
-AC_INIT([i3], [4.18.1], [https://github.com/i3/i3/issues])
+AC_INIT([i3], [4.18.2], [https://github.com/i3/i3/issues])
 # For AX_EXTEND_SRCDIR
 AX_ENABLE_BUILDDIR
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])