Merge remote-tracking branch 'upstream/2.4' into main

mixxxdj · Jan 18, 2024 · 6aed612 · 6aed612
2 parents 7e8deda + 06b69c9
commit 6aed612
Show file tree

Hide file tree

Showing 11 changed files with 9,022 additions and 3,298 deletions.
diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
@@ -121,7 +121,7 @@ jobs:
         run: |
           sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
           sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
+          sudo apt-get install -y --allow-downgrades libc6=2.35* libc6-dev=2.35* libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
       - name: Build
         # Do not abort on errors and build/check the whole project
         run: cmake --build . -j $(nproc) -- --keep-going

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/res/Mixxx-Keyboard-Shortcuts.pdf b/res/Mixxx-Keyboard-Shortcuts.pdf
diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg