Mixxx

Merge lp://staging/~mixxxdevelopers/mixxx/fixes_midi_burnout into lp://staging/~mixxxdevelopers/mixxx/trunk

  1. fixes_midi_burnout
  2. Merge into trunk
Proposed by William Good
Status: Merged
Merged at revision: 3257
Proposed branch: lp://staging/~mixxxdevelopers/mixxx/fixes_midi_burnout
Merge into: lp://staging/~mixxxdevelopers/mixxx/trunk
Diff against target: 147 lines (+49/-7)
7 files modified
mixxx/build/depends.py (+1/-0)
mixxx/src/controllers/controller.h (+3/-2)
mixxx/src/controllers/controllermanager.cpp (+6/-1)
mixxx/src/controllers/midi/portmidicontroller.cpp (+4/-3)
mixxx/src/controllers/midi/portmidicontroller.h (+1/-1)
mixxx/src/sleepableqthread.cpp (+8/-0)
mixxx/src/sleepableqthread.h (+26/-0)
To merge this branch: bzr merge lp://staging/~mixxxdevelopers/mixxx/fixes_midi_burnout
Reviewer Review Type Date Requested Status
Mixxx Development Team Pending
Review via email: mp+106679@code.staging.launchpad.net
To post a comment you must log in.

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.

Subscribers

People subscribed via source and target branches