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

tdemin · Oct 19, 2021 · 0980de6 · 0980de6
2 parents 588b9c2 + 46f4fe4
commit 0980de6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/RELEASE-NOTES-4.19.2 b/RELEASE-NOTES-4.19.2
diff --git a/RELEASE-NOTES-next → RELEASE-NOTES-4.20 b/RELEASE-NOTES-next → RELEASE-NOTES-4.20
@@ -77,3 +77,17 @@ In case you notice any issues regarding your background/wallpaper, note:
   • clear pixmap before drawing to prevent visual garbage
   • fix crash with "layout default"
   • send an "output" event on XRandR 1.5 monitor configuration change
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  ajakk, Albert Safin, Anaël Beutot, Antoine Martin, Dmitri Goutnik, ekarpp,
+  Imran Virani, Ingo Bürk, Isaac Garzon, Ivan Milov, Jay Khandkar, j-jzk, Ken
+  Gilmer, Kjetil Torgrim Homme, lbonn, Michael Stapelberg, Orestis Floros, Ralph
+  Gutkowski, Romuald Brunet, tomty89, Tristan Giles, Tudor Brindus, Uli
+  Schlachter, Vincent Bernat, Vladimir Panteleev
+
+-- Michael Stapelberg, 2021-10-19
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+i3-wm (4.20-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Tue, 19 Oct 2021 08:45:18 +0200
+
 i3-wm (4.19.2-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/meson.build b/meson.build
@@ -6,7 +6,7 @@
 project(
   'i3',
   'c',
-  version: '4.19.2',
+  version: '4.20',
   default_options: [
     'c_std=c11',
     'warning_level=1',  # enable all warnings (-Wall)