From 1225acee9e7a22da678c1178b6eb279f2101699f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 14 Jan 2024 17:19:28 +0100
Subject: [PATCH] Add recent merges

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cede8e27f89..1b8cc79f0cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -559,6 +559,7 @@
 * Fix use of deprecated COs in Skins [#12030](https://github.com/mixxxdj/mixxx/pull/12030)
 * Log warning if deprecated control is used [#11972](https://github.com/mixxxdj/mixxx/pull/11972)
 * ControlObject alias improvements [#11973](https://github.com/mixxxdj/mixxx/pull/11973)
+* Repeat certain control actions if keyboard key is held [#12474](https://github.com/mixxxdj/mixxx/pull/12474)
 
 ### Skins
 
@@ -712,7 +713,9 @@
   [#11982](https://github.com/mixxxdj/mixxx/pull/11982)
   [#11995](https://github.com/mixxxdj/mixxx/pull/11995)
   [#11994](https://github.com/mixxxdj/mixxx/pull/11994)
-* Preferences waveforms: recall correct waveform type when selecting an overview type [#12231](https://github.com/mixxxdj/mixxx/pull/12231) [#12226](https://github.com/mixxxdj/mixxx/issues/12226)
+* Preferences waveforms: recall correct waveform type when selecting an overview type
+  [#12231](https://github.com/mixxxdj/mixxx/pull/12231)
+  [#12226](https://github.com/mixxxdj/mixxx/issues/12226)
 
 ### Effects
 
@@ -786,6 +789,7 @@
   [#10834](https://github.com/mixxxdj/mixxx/issues/10834)
   [#11424](https://github.com/mixxxdj/mixxx/pull/11424) [#11376](https://github.com/mixxxdj/mixxx/pull/11376)
   [#11456](https://github.com/mixxxdj/mixxx/pull/11456) [#11454](https://github.com/mixxxdj/mixxx/issues/11454)
+  [#11695](https://github.com/mixxxdj/mixxx/pull/11695)
 
 ### Target Support
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index a01b3224988..1f58b367c36 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-01-12" timestamp="1705042968">
+    <release version="2.4.0" type="development" date="2024-01-14" timestamp="1705248537">
       <description>
  <p>
   Cover Art
@@ -1374,6 +1374,10 @@
    ControlObject alias improvements
    #11973
   </li>
+  <li>
+   Repeat certain control actions if keyboard key is held
+   #12474
+  </li>
  </ul>
  <p>
   Skins
@@ -1914,6 +1918,7 @@
    #11376
    #11456
    #11454
+   #11695
   </li>
  </ul>
  <p>