Merge remote-tracking branch 'mixxx/2.5'

Conflicts: source/chapters/appendix/changelog.rst
mixxxdj · Jan 6, 2025 · c08601a · c08601a
2 parents 32c3b47 + 5235c20
commit c08601a
Show file tree

Hide file tree

Showing 21 changed files with 721 additions and 0 deletions.
diff --git a/source/_static/controllers/numark_ns6ii_schematics/display.svg b/source/_static/controllers/numark_ns6ii_schematics/display.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/front_view.svg b/source/_static/controllers/numark_ns6ii_schematics/front_view.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/fx_unit.svg b/source/_static/controllers/numark_ns6ii_schematics/fx_unit.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/mixer.svg b/source/_static/controllers/numark_ns6ii_schematics/mixer.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/auto_loop.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/auto_loop.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/beat_jump.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/beat_jump.svg
diff --git a/...tatic/controllers/numark_ns6ii_schematics/performancepads/beatgrid_settings.svg b/...tatic/controllers/numark_ns6ii_schematics/performancepads/beatgrid_settings.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/generic.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/generic.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/hotcues.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/hotcues.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/intro_outro.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/intro_outro.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/key_control.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/key_control.svg
diff --git a/...ce/_static/controllers/numark_ns6ii_schematics/performancepads/loop_control.svg b/...ce/_static/controllers/numark_ns6ii_schematics/performancepads/loop_control.svg
diff --git a/source/_static/controllers/numark_ns6ii_schematics/performancepads/sampler.svg b/source/_static/controllers/numark_ns6ii_schematics/performancepads/sampler.svg