diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-09-29 08:39:26 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-09-29 08:39:26 +0200 |
| commit | e4d2e5a8a4034afc3a0ab3dd683bf3342fea3e55 (patch) | |
| tree | fdebacaff56110b48cbc967685668ab4b0f65b4f | |
| parent | fe7eb4f35a74102bc05d5c104764865cdde0f861 (diff) | |
| parent | 061943f5e78f4128c2c91c52692cda7bfcbe0649 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | res/linux/org.mixxx.Mixxx.metainfo.xml | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7631a284b8..1b34fa34e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -403,9 +403,10 @@ ## [2.3.1](https://launchpad.net/mixxx/+milestone/2.3.1) (Unreleased) -* Added mapping for the Numark DJ2GO Touch controller [#4108](https://github.com/mixxxdj/mixxx/pull/4108) +* Added mapping for the Numark DJ2GO2 Touch controller [#4108](https://github.com/mixxxdj/mixxx/pull/4108) * Added mapping for the Numark Mixtrack Pro FX controller [#4160](https://github.com/mixxxdj/mixxx/pull/4160) * Updated mapping for Behringer DDM4000 mixer [#4262](https://github.com/mixxxdj/mixxx/pull/4262) +* Updated mapping for Denon MC7000 controller [#4021](https://github.com/mixxxdj/mixxx/pull/4021) * Disabled detection of keyboards and mice as HID controllers [#4243](https://github.com/mixxxdj/mixxx/pull/4243) * Disabled detection of all HID controllers with Apple's vendor ID. Apple doesn't build actual controllers. [#4260](https://github.com/mixxxdj/mixxx/pull/4260) [#4273](https://github.com/mixxxdj/mixxx/pull/4273) * Add support for HiDPI scale factors of 125% and 175% (only with Qt 5.14+) [lp1938102](https://bugs.launchpad.net/mixxx/+bug/1938102) [#4161](https://github.com/mixxxdj/mixxx/pull/4161) @@ -439,9 +440,9 @@ * .desktop file has be renamed to org.mixxx.Mixxx.desktop according to Freedesktop standards [#4206](https://github.com/mixxxdj/mixxx/pull/4206) * Uses system provided hidapi library if version >= 0.10.1 [#4215](https://github.com/mixxxdj/mixxx/pull/4215) * Please update PortAudio to [19.7](https://github.com/PortAudio/portaudio/releases/tag/v19.7.0) if you have not done so already. This is required for Mixxx to work with PipeWire via the JACK API for many devices. -* Install multiple sizes of rasterized icons [#4204](https://github.com/mixxxdj/mixxx/pull/4204) +* Install multiple sizes of rasterized icons [#4204](https://github.com/mixxxdj/mixxx/pull/4204) [#4315](https://github.com/mixxxdj/mixxx/pull/4315) * CMake: Fixed detection of SoundTouch pkgconfig file and version [#4209](https://github.com/mixxxdj/mixxx/pull/4209) -* Fix AppStream metainfo [#4205](https://github.com/mixxxdj/mixxx/pull/4205) +* Fix AppStream metainfo [#4205](https://github.com/mixxxdj/mixxx/pull/4205) [#4317](https://github.com/mixxxdj/mixxx/pull/4317) ## [2.3.0](https://launchpad.net/mixxx/+milestone/2.3.0) (2021-06-28) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 65ee923b31..08271b7d4e 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -702,7 +702,7 @@ <description> <ul> <li> - Added mapping for the Numark DJ2GO Touch controller + Added mapping for the Numark DJ2GO2 Touch controller #4108 </li> <li> @@ -714,6 +714,10 @@ #4262 </li> <li> + Updated mapping for Denon MC7000 controller + #4021 + </li> + <li> Disabled detection of keyboards and mice as HID controllers #4243 </li> @@ -863,6 +867,7 @@ <li> Install multiple sizes of rasterized icons #4204 + #4315 </li> <li> CMake: Fixed detection of SoundTouch pkgconfig file and version @@ -871,6 +876,7 @@ <li> Fix AppStream metainfo #4205 + #4317 </li> </ul> </description> |