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

mixxxdj · Apr 21, 2020 · c41c097 · c41c097
2 parents 367ee55 + 961056e
commit c41c097
Show file tree

Hide file tree

Showing 14 changed files with 928 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -235,6 +235,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/dialog/dlgaboutdlg.ui
   src/dialog/dlgdevelopertools.cpp
   src/dialog/dlgdevelopertoolsdlg.ui
+  src/dialog/dlgreplacecuecolor.cpp
+  src/dialog/dlgreplacecuecolordlg.ui
   src/effects/builtin/autopaneffect.cpp
   src/effects/builtin/balanceeffect.cpp
   src/effects/builtin/bessel4lvmixeqeffect.cpp

diff --git a/build/depends.py b/build/depends.py
@@ -764,6 +764,7 @@ def sources(self, build):
                    "src/controllers/dlgprefcontrollers.cpp",
                    "src/dialog/dlgabout.cpp",
                    "src/dialog/dlgdevelopertools.cpp",
+                   "src/dialog/dlgreplacecuecolor.cpp",
 
                    "src/preferences/configobject.cpp",
                    "src/preferences/dialog/dlgprefautodj.cpp",
@@ -1346,6 +1347,7 @@ def sources(self, build):
             'src/controllers/dlgprefcontrollersdlg.ui',
             'src/dialog/dlgaboutdlg.ui',
             'src/dialog/dlgdevelopertoolsdlg.ui',
+            'src/dialog/dlgreplacecuecolordlg.ui',
             'src/library/autodj/dlgautodj.ui',
             'src/library/dlganalysis.ui',
             'src/library/dlgcoverartfullsize.ui',