diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-03-20 21:34:04 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-03-20 21:34:04 +0100 |
| commit | 95251da86e6a2e4ec1bf73f3e7d3188730a9dd9a (patch) | |
| tree | ab51696a919bda7b89bbc14b04e2186c49b6f7c6 /build | |
| parent | cb82a4d97d8aa29be817164ecee94844a37051b8 (diff) | |
| parent | 21daa85975fe0300505eaeb9e81decfdf8c472fc (diff) | |
Merge branch 'master' into basetracktablemodel
Diffstat (limited to 'build')
| -rw-r--r-- | build/depends.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/depends.py b/build/depends.py index 2b5198666f..f5a1fb6c17 100644 --- a/build/depends.py +++ b/build/depends.py @@ -768,6 +768,7 @@ class MixxxCore(Feature): "src/preferences/configobject.cpp", "src/preferences/dialog/dlgprefautodj.cpp", "src/preferences/dialog/dlgprefdeck.cpp", + "src/preferences/dialog/dlgprefcolors.cpp", "src/preferences/dialog/dlgprefcrossfader.cpp", "src/preferences/dialog/dlgprefeffects.cpp", "src/preferences/dialog/dlgprefeq.cpp", @@ -790,6 +791,8 @@ class MixxxCore(Feature): "src/preferences/effectsettingsmodel.cpp", "src/preferences/broadcastprofile.cpp", "src/preferences/upgrade.cpp", + "src/preferences/colorpaletteeditor.cpp", + "src/preferences/colorpaletteeditormodel.cpp", "src/preferences/colorpalettesettings.cpp", "src/preferences/dlgpreferencepage.cpp", @@ -1288,6 +1291,7 @@ class MixxxCore(Feature): "src/util/console.cpp", "src/util/color/color.cpp", "src/util/color/colorpalette.cpp", + "src/util/color/predefinedcolorpalettes.cpp", "src/util/db/dbconnection.cpp", "src/util/db/dbconnectionpool.cpp", "src/util/db/dbconnectionpooler.cpp", @@ -1349,6 +1353,7 @@ class MixxxCore(Feature): 'src/preferences/dialog/dlgprefautodjdlg.ui', 'src/preferences/dialog/dlgprefbeatsdlg.ui', 'src/preferences/dialog/dlgprefdeckdlg.ui', + 'src/preferences/dialog/dlgprefcolorsdlg.ui', 'src/preferences/dialog/dlgprefcrossfaderdlg.ui', 'src/preferences/dialog/dlgpreflv2dlg.ui', 'src/preferences/dialog/dlgprefeffectsdlg.ui', |