From 2a7aab2cfddf14ad751518a31600b246d6e5bb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 10 Nov 2024 23:53:13 +0100
Subject: [PATCH] Add latest merges to CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cdc9a0cf69..8a0d66110c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Controller Mappings
 
 * Denon MC7000: Fix star up/down logic by only handling button down events [#13588](https://github.com/mixxxdj/mixxx/pull/13588)
+* Intech TEK2: Add initial mapping [#13521](https://github.com/mixxxdj/mixxx/pull/13521)
 * Korg Kaoss DJ: Update script [#12683](https://github.com/mixxxdj/mixxx/pull/12683)
 * MIDI for light: Fix unsound timer handling [#13117](https://github.com/mixxxdj/mixxx/pull/13117)
 * Novation Dicer: Remove flanger mapping with quickeffect toggle
@@ -17,9 +18,10 @@
 * Numark Scratch: Add initial mapping
   [#4834](https://github.com/mixxxdj/mixxx/pull/4834)
   [#13375](https://github.com/mixxxdj/mixxx/pull/13375)
-* Pioneer DDJ-400 and DDJ-FLX4: Remove tap beat mapping to resolve conflict with toggle quantize
+* Pioneer DDJ-400 and DDJ-FLX4: Remove tap beat mapping to resolve conflict with toggle quantize and fix shift + play
   [#13815](https://github.com/mixxxdj/mixxx/pull/13815)
   [#13813](https://github.com/mixxxdj/mixxx/issues/13813)
+  [#13857](https://github.com/mixxxdj/mixxx/pull/13857)
 * Reloop Beatmix 2/4: Fix eject button and jog LED being lit on track unload
   [#13601](https://github.com/mixxxdj/mixxx/pull/13601)
   [#13605](https://github.com/mixxxdj/mixxx/pull/13605)
@@ -119,6 +121,9 @@
   [#13692](https://github.com/mixxxdj/mixxx/pull/13692)
   [#13660](https://github.com/mixxxdj/mixxx/issues/13660)
 * Fix unnecessary painting with covers in library [#13715](https://github.com/mixxxdj/mixxx/pull/13715)
+* Fix check for unrelated decks playing when starting Auto DJ
+  [#13762](https://github.com/mixxxdj/mixxx/pull/13762)
+  [#13734](https://github.com/mixxxdj/mixxx/issues/13734)
 
 ## [2.4.1](https://github.com/mixxxdj/mixxx/milestone/41?closed=1) (2024-05-08)
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index 4d8847fa6aa..38a75d7e616 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.2" type="development" date="2024-10-30" timestamp="1730312112">
+    <release version="2.4.2" type="development" date="2024-11-14" timestamp="1731621997">
       <description>
  <p>
   Controller Mappings
@@ -106,6 +106,10 @@
    Denon MC7000: Fix star up/down logic by only handling button down events
    #13588
   </li>
+  <li>
+   Intech TEK2: Add initial mapping
+   #13521
+  </li>
   <li>
    Korg Kaoss DJ: Update script
    #12683
@@ -134,9 +138,10 @@
    #13375
   </li>
   <li>
-   Pioneer DDJ-400 and DDJ-FLX4: Remove tap beat mapping to resolve conflict with toggle quantize
+   Pioneer DDJ-400 and DDJ-FLX4: Remove tap beat mapping to resolve conflict with toggle quantize and fix shift + play
    #13815
    #13813
+   #13857
   </li>
   <li>
    Reloop Beatmix 2/4: Fix eject button and jog LED being lit on track unload
@@ -342,6 +347,11 @@
    Fix unnecessary painting with covers in library
    #13715
   </li>
+  <li>
+   Fix check for unrelated decks playing when starting Auto DJ
+   #13762
+   #13734
+  </li>
  </ul>
 </description>
     </release>