Merge lp://qastaging/~mixxxcontributors/mixxx/features_autodj into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
RJ Skerry-Ryan
Status: | Merged |
---|---|
Merged at revision: | 2989 |
Proposed branch: | lp://qastaging/~mixxxcontributors/mixxx/features_autodj |
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
Diff against target: |
2584 lines (+1353/-475) 16 files modified
mixxx/res/images/autodj/bottom.svg (+137/-0) mixxx/res/images/autodj/media-playlist-shuffle.svg (+214/-0) mixxx/res/images/autodj/stock_mail-send-receive.svg (+87/-0) mixxx/res/mixxx.qrc (+3/-0) mixxx/src/dlgautodj.cpp (+487/-225) mixxx/src/dlgautodj.h (+32/-9) mixxx/src/dlgautodj.ui (+110/-18) mixxx/src/library/autodjfeature.cpp (+33/-31) mixxx/src/library/autodjfeature.h (+5/-3) mixxx/src/library/browse/browsefeature.cpp (+94/-68) mixxx/src/library/browse/browsefeature.h (+2/-2) mixxx/src/library/browse/browsetablemodel.cpp (+108/-107) mixxx/src/library/browse/browsetablemodel.h (+1/-1) mixxx/src/library/dao/cratedao.h (+2/-0) mixxx/src/widget/wtracktableview.cpp (+33/-8) mixxx/src/widget/wtracktableview.h (+5/-3) |
To merge this branch: | bzr merge lp://qastaging/~mixxxcontributors/mixxx/features_autodj |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
RJ Skerry-Ryan | Approve | ||
Review via email:
|
Description of the change
This branch brings Daniel Schürmann improvements to AutoDJ into Mixxx. I have reviewed the branch and it looks good to me from a stability and product/feature point of view.
To post a comment you must log in.