From 8fdd09db897ffd5e22427ee54b52bbc825b12dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 10 Nov 2024 23:53:13 +0100 Subject: [PATCH 1/2] Add latest merges to CHANGELOG --- CHANGELOG.md | 4 +++- res/linux/org.mixxx.Mixxx.metainfo.xml | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cdc9a0cf69..92635aec98a 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) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 4d8847fa6aa..44ce4ef13e8 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. --> - +

Controller Mappings @@ -106,6 +106,10 @@ Denon MC7000: Fix star up/down logic by only handling button down events #13588 +

  • + Intech TEK2: Add initial mapping + #13521 +
  • Korg Kaoss DJ: Update script #12683 @@ -134,9 +138,10 @@ #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 #13813 + #13857
  • Reloop Beatmix 2/4: Fix eject button and jog LED being lit on track unload From 4e48f2ef996b10dfb4596197c70936162047c1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 10 Nov 2024 23:57:52 +0100 Subject: [PATCH 2/2] Bump CMAKE_PROJECT_VERSION and LICENSE to 2.4.2 --- CMakeLists.txt | 2 +- LICENSE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb5ce07c5f8..11b0dfcd4c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,7 +185,7 @@ if(APPLE) endif() endif() -project(mixxx VERSION 2.4.1) +project(mixxx VERSION 2.4.2) enable_language(C CXX) # Work around missing version suffixes support https://gitlab.kitware.com/cmake/cmake/-/issues/16716 set(MIXXX_VERSION_PRERELEASE "") # set to "alpha" "beta" or "" diff --git a/LICENSE b/LICENSE index 908658f6746..4400038807d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Mixxx 2.4.1, Digital DJ'ing software. +Mixxx 2.4.2, Digital DJ'ing software. Copyright (C) 2001-2024 Mixxx Development Team Mixxx is free software; you can redistribute it and/or modify