Merge pull request #3535 from ronso0/main

merge 2.3 into main
mixxxdj · Jan 6, 2021 · f67460d · f67460d
2 parents 02a2213 + 5585ae6
commit f67460d
Show file tree

Hide file tree

Showing 87 changed files with 757 additions and 11,091 deletions.
diff --git a/res/controllers/Hercules-P32-scripts.js b/res/controllers/Hercules-P32-scripts.js
diff --git a/res/images/preferences/dark/ic_preferences_autodj.svg b/res/images/preferences/dark/ic_preferences_autodj.svg
diff --git a/res/images/preferences/dark/ic_preferences_bpmdetect.svg b/res/images/preferences/dark/ic_preferences_bpmdetect.svg
diff --git a/res/images/preferences/dark/ic_preferences_broadcast.svg b/res/images/preferences/dark/ic_preferences_broadcast.svg
diff --git a/res/images/preferences/dark/ic_preferences_colors.svg b/res/images/preferences/dark/ic_preferences_colors.svg
diff --git a/res/images/preferences/dark/ic_preferences_controllers.svg b/res/images/preferences/dark/ic_preferences_controllers.svg
diff --git a/res/images/preferences/dark/ic_preferences_crossfader.svg b/res/images/preferences/dark/ic_preferences_crossfader.svg
diff --git a/res/images/preferences/dark/ic_preferences_decks.svg b/res/images/preferences/dark/ic_preferences_decks.svg
diff --git a/res/images/preferences/dark/ic_preferences_effects.svg b/res/images/preferences/dark/ic_preferences_effects.svg
diff --git a/res/images/preferences/dark/ic_preferences_equalizers.svg b/res/images/preferences/dark/ic_preferences_equalizers.svg
diff --git a/res/images/preferences/dark/ic_preferences_interface.svg b/res/images/preferences/dark/ic_preferences_interface.svg