diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-09-29 23:30:04 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-09-29 23:56:59 +0200 |
| commit | ec47b2bb372c296d63883a0d175afd43cab2e6ad (patch) | |
| tree | aa01aee9b0a3aa3a21e217c8144dc369f398ac21 /src/widget/wcoverart.h | |
| parent | 8ed23759ad69d542fcb19456d7dfab38bb747514 (diff) | |
| parent | 8e0a217781d5f79ebe7efba93d5fe862061ad39c (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# src/library/dao/autodjcratesdao.h
# src/library/searchquery.cpp
# src/library/searchquery.h
# src/library/trackset/baseplaylistfeature.h
# src/library/trackset/crate/cratefeature.h
# src/mixer/playermanager.h
# src/test/controllerengine_test.cpp
# src/test/librarytest.h
Diffstat (limited to 'src/widget/wcoverart.h')
| -rw-r--r-- | src/widget/wcoverart.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h index f4c3b4cf4f..bb167f97d3 100644 --- a/src/widget/wcoverart.h +++ b/src/widget/wcoverart.h @@ -9,7 +9,6 @@ #include "mixer/basetrackplayer.h" #include "preferences/usersettings.h" -#include "track/track.h" #include "library/coverartcache.h" #include "skin/skincontext.h" #include "widget/trackdroptarget.h" |