Mixxx

Merge lp://qastaging/~mixxxdevelopers/mixxx/cleanup-prefs-1.11 into lp://qastaging/mixxx/1.11

  1. cleanup-prefs-1.11
  2. Merge into release-1.11.x
Proposed by Sean M. Pappalardo
Status: Needs review
Proposed branch: lp://qastaging/~mixxxdevelopers/mixxx/cleanup-prefs-1.11
Merge into: lp://qastaging/mixxx/1.11
Diff against target: 1706 lines (+983/-384) (has conflicts)
4 files modified
mixxx/src/dlgprefcontrols.cpp (+130/-59)
mixxx/src/dlgprefcontrols.h (+10/-6)
mixxx/src/dlgprefcontrolsdlg.ui (+839/-315)
mixxx/src/dlgprefplaylistdlg.ui (+4/-4)
Text conflict in mixxx/src/dlgprefcontrols.cpp
Text conflict in mixxx/src/dlgprefcontrols.h
Text conflict in mixxx/src/dlgprefcontrolsdlg.ui
To merge this branch: bzr merge lp://qastaging/~mixxxdevelopers/mixxx/cleanup-prefs-1.11
Reviewer Review Type Date Requested Status
Mixxx Development Team Pending
Review via email: mp+199167@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Sean M. Pappalardo (pegasus-renegadetech) wrote :

Replaced by https://github.com/mixxxdj/mixxx/pull/527

Reply

Unmerged revisions

3517. By Sean M. Pappalardo

Cleaned up Interface pane, grouping pitch items together and changing yes\/no options to radio buttons and check boxes as appropriate.

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