From ca8720f8f365853bb80e23714ed89e41b54d536a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 16 Feb 2024 00:23:29 +0100
Subject: [PATCH] Release 2.4.0

---
 CHANGELOG.md                           |  4 ++--
 res/linux/org.mixxx.Mixxx.metainfo.xml | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ab0d28ac9a..1292e7594a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased)
+## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (2024-02-16)
 
 ### Music Library: Tracks Table & Track Menu
 
@@ -502,7 +502,6 @@
 * Add `skins:` path alias [#12463](https://github.com/mixxxdj/mixxx/pull/12463)
 * Remove `Text`, use `TrackProperty` or `Label` [#12004](https://github.com/mixxxdj/mixxx/pull/12004)
 * Beat spinBox/AutoDJ spinbox: Enter & Esc also move focus to library [#4617](https://github.com/mixxxdj/mixxx/pull/4617) [#4845](https://github.com/mixxxdj/mixxx/pull/4845)
-* Samplers: don't create extra empty players during startup [#12657](https://github.com/mixxxdj/mixxx/pull/12657)
 * Add effect chain menu button to Deere, polish in Tango [#12735](https://github.com/mixxxdj/mixxx/pull/12735)
 * Skins: reload default.qss when (re)loading a skin [#12219](https://github.com/mixxxdj/mixxx/pull/12219)
 
@@ -798,6 +797,7 @@
   [#12517](https://github.com/mixxxdj/mixxx/issues/12630)
 * Linux: possible crash when enabling a MIDI controller [#12001](https://github.com/mixxxdj/mixxx/issues/12001)
   Introduce with Qt 5.15.5, fixed in Qt 5.15.17 and Qt 6.6.3
+* Extra Samplers are created during startup, when found in a saved Sampler Bank [#12657](https://github.com/mixxxdj/mixxx/pull/12657) [#12809](https://github.com/mixxxdj/mixxx/pull/12809)
 
 ## [2.3.6](https://github.com/mixxxdj/mixxx/milestone/40) (2023-08-15)
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index 1e014c875cd..b879474cbc4 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.4.0" type="development" date="2024-02-12" timestamp="1707749791">
+    <release version="2.4.0" type="stable" date="2024-02-16" timestamp="1708041600">
       <description>
  <p>
   Music Library: Tracks Table &amp; Track Menu
@@ -1421,10 +1421,6 @@
    #4617
    #4845
   </li>
-  <li>
-   Samplers: don't create extra empty players during startup
-   #12657
-  </li>
   <li>
    Add effect chain menu button to Deere, polish in Tango
    #12735
@@ -2026,6 +2022,11 @@
    #12001
    Introduce with Qt 5.15.5, fixed in Qt 5.15.17 and Qt 6.6.3
   </li>
+  <li>
+   Extra Samplers are created during startup, when found in a saved Sampler Bank
+   #12657
+   #12809
+  </li>
  </ul>
 </description>
     </release>