Merge branch '2.3' of github.com:mixxxdj/mixxx

mixxxdj · Apr 11, 2021 · efaad0e · efaad0e
2 parents 91cdfce + a49f56d
commit efaad0e
Show file tree

Hide file tree

Showing 5 changed files with 15,728 additions and 15,515 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,6 +57,9 @@ jobs:
           - name: Windows 2019 (MSVC)
             os: windows-2019
             # TODO: Reenable FFmpeg after licensing issues have been clarified
+            # Attention: If you change the cmake_args for the Windows CI build,
+            #            also adjust the for the local Windows build setup in
+            #            ./tools/windows_buildenv.bat
             cmake_args: >-
               -DBULK=OFF
               -DFFMPEG=OFF

diff --git a/res/Mixxx-Keyboard-Shortcuts.pdf b/res/Mixxx-Keyboard-Shortcuts.pdf