diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-18 00:36:31 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-18 00:36:31 +0200 |
| commit | b6cfcccfc793a8a5b9ce8ebab4b3f76332c9b88d (patch) | |
| tree | 3831f093e5c30c61bf17423d404d02ee892a4173 /build | |
| parent | 37065cc277f71263dc3ae3dbf6d3ed8a20c25ece (diff) | |
| parent | e3ab409a58a3170521df5ddf3e0a140c9d6559da (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-replace
Diffstat (limited to 'build')
| -rw-r--r-- | build/depends.py | 2 | ||||
| -rw-r--r-- | build/osx/golden_environment | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/depends.py b/build/depends.py index f5a0aebedb..2c6598ab7a 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1024,6 +1024,7 @@ class MixxxCore(Feature): "src/widget/wlibrarytableview.cpp", "src/widget/wanalysislibrarytableview.cpp", "src/widget/wlibrarytextbrowser.cpp", + "src/widget/wtrackmenu.cpp", "src/database/mixxxdb.cpp", "src/database/schemamanager.cpp", @@ -1317,7 +1318,6 @@ class MixxxCore(Feature): "src/util/logger.cpp", "src/util/logging.cpp", "src/util/cmdlineargs.cpp", - "src/util/widgethider.cpp", "src/util/autohidpi.cpp", "src/util/screensaver.cpp", "src/util/indexrange.cpp", diff --git a/build/osx/golden_environment b/build/osx/golden_environment index b448c71f02..4cefc5cced 100644 --- a/build/osx/golden_environment +++ b/build/osx/golden_environment @@ -1 +1 @@ -2.3-j00010-5859796f-osx10.11-x86_64-release +2.3-j00004-497fe02e-osx10.11-x86_64-release |