Merge lp://qastaging/~neale/mixxx/bulk into lp://qastaging/~mixxxdevelopers/mixxx/trunk

Proposed by Neale Pickett
Status: Merged
Merged at revision: 3303
Proposed branch: lp://qastaging/~neale/mixxx/bulk
Merge into: lp://qastaging/~mixxxdevelopers/mixxx/trunk
Diff against target: 68 lines (+20/-1)
3 files modified
mixxx/res/controllers/Hercules DJ Control MP3 e2.bulk.xml (+4/-1)
mixxx/src/controllers/controllerpresetinfo.cpp (+15/-0)
mixxx/src/controllers/controllerpresetinfo.h (+1/-0)
To merge this branch: bzr merge lp://qastaging/~neale/mixxx/bulk
Reviewer Review Type Date Requested Status
Mixxx Development Team Pending
Review via email: mp+128624@code.qastaging.launchpad.net

Description of the change

make bulk controllers (Hercules MP3e2 only, currently) work again.

To post a comment you must log in.
lp://qastaging/~neale/mixxx/bulk updated
3301. By RJ Skerry-Ryan

Merging from lp:mixxx/1.11

3302. By Neale Pickett

Merge upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.