From 6c6345fa3eb0250d39aeb3937acc9a3e82796b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 18 Mar 2024 08:43:28 +0100
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md                           |  5 +++++
 res/linux/org.mixxx.Mixxx.metainfo.xml | 25 +++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6341b3c4f38..613b6a0a64a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 * fixes around cratetablemodel, remove tracks + don't allow pasting tracks into locked playlists/crates or History [#12926](https://github.com/mixxxdj/mixxx/pull/12926)
 * Tootips: Improve `rate_up/down` tooltips, pitch vs. speed [#12590](https://github.com/mixxxdj/mixxx/pull/12590)
 * Shortkeys for track list management [#12020](https://github.com/mixxxdj/mixxx/pull/12020)
+* Track menu: rephrase "Reset" to "Clear" [#12955](https://github.com/mixxxdj/mixxx/pull/12955)
 
 ### Controller Mappings
 
@@ -28,6 +29,7 @@
 
 * Send sysex to all handlers [#12827](https://github.com/mixxxdj/mixxx/pull/12827)
 * Add control for showing a deck's track menu [#10825](https://github.com/mixxxdj/mixxx/pull/10825)
+* Removed old examples HID keyboard and HID trackpad [#12977](https://github.com/mixxxdj/mixxx/pull/12977)
 
 ### Experimental QML Skin
 
@@ -139,6 +141,9 @@
 * Labeler: Add `qml` to labeler config [#12911](https://github.com/mixxxdj/mixxx/pull/12911)
 * WTrackMenu: Add missing wcoverartlabel.h include [#12924](https://github.com/mixxxdj/mixxx/pull/12924)
 * Fix clazy complains and naming [#12935](https://github.com/mixxxdj/mixxx/pull/12935)
+* src/library: sort files into sub-directories [#12956](https://github.com/mixxxdj/mixxx/pull/12956)
+* CMakeLists: Fix deduplication trap with `--preload-file` [#12944](https://github.com/mixxxdj/mixxx/pull/12944)
+* Add CI runner that allows cleaning up the download server [#12957](https://github.com/mixxxdj/mixxx/pull/12957)
 * Update to latest vcpkg dependencies
   [#11649](https://github.com/mixxxdj/mixxx/pull/11649)
   [#12512](https://github.com/mixxxdj/mixxx/pull/12512)
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index c6f94118030..ac1cc4d7c35 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.5.0" type="development" date="2024-03-12" timestamp="1710276479">
+    <release version="2.5.0" type="development" date="2024-03-13" timestamp="1710302656">
       <description>
  <p>
   Features
@@ -169,6 +169,10 @@
    Shortkeys for track list management
    #12020
   </li>
+  <li>
+   Track menu: rephrase "Reset" to "Clear"
+   #12955
+  </li>
  </ul>
  <p>
   Controller Mappings
@@ -191,6 +195,10 @@
    Add control for showing a deck's track menu
    #10825
   </li>
+  <li>
+   Removed old examples HID keyboard and HID trackpad
+   #12977
+  </li>
  </ul>
  <p>
   Experimental QML Skin
@@ -639,6 +647,19 @@
    Fix clazy complains and naming
    #12935
   </li>
+  <li>
+   src/library: sort files into sub-directories
+   #12956
+  </li>
+  <li>
+   CMakeLists: Fix deduplication trap with
+   --preload-file
+   #12944
+  </li>
+  <li>
+   Add CI runner that allows cleaning up the download server
+   #12957
+  </li>
   <li>
    Update to latest vcpkg dependencies
    #11649
@@ -683,7 +704,7 @@
  </ul>
 </description>
     </release>
-    <release version="2.4.1" type="development" date="2024-03-12" timestamp="1710276479">
+    <release version="2.4.1" type="development" date="2024-03-13" timestamp="1710302656">
       <description>
  <p>
   Controller Mappings